diff mbox

[2/2] android: amdgpu: fix build break

Message ID 1500459483-5795-2-git-send-email-cwhuang@linux.org.tw (mailing list archive)
State New, archived
Headers show

Commit Message

Chih-Wei Huang July 19, 2017, 10:18 a.m. UTC
Define two macros to avoid building errors.

Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
---
 amdgpu/Android.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Emil Velikov July 19, 2017, 6:13 p.m. UTC | #1
On 19 July 2017 at 11:18, Chih-Wei Huang <cwhuang@android-x86.org> wrote:
> Define two macros to avoid building errors.
>
> Fixes: 7e6bf88cac (amdgpu: move asic id table to a separate file)
>
> Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
> ---
>  amdgpu/Android.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
> index bf0611b..955bd53 100644
> --- a/amdgpu/Android.mk
> +++ b/amdgpu/Android.mk
> @@ -10,5 +10,11 @@ LOCAL_SHARED_LIBRARIES := libdrm
>
>  LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
>
> +LOCAL_CFLAGS := \
> +       -DAMDGPU_ASIC_ID_TABLE=\"/etc/hwdata/amdgpu.ids\" \
You want to use the same path in both places like we do in automake -
see libdrmdatadir.
One simply does not need to bother/track if TARGET_OUT_ETC expands to
/etc/ or as mentioned in [1] /system/etc/

-Emil
[1] https://source.codeaurora.org/external/gigabyte/ag-gb-dsds-7227/plain/frameworks/base/data/etc/Android.mk
Chunming Zhou Aug. 1, 2017, 2:57 a.m. UTC | #2
+ dri-devel, maybe other guys know it.


On 2017年08月01日 00:15, Chih-Wei Huang wrote:
>> I want to enable tcp adb in terminal before surfaceflinger, since in some
>> cases, adb cannot connect over tcp if surfaceflinger crash or dead off.
>> I have tried several things:
>>   Android7 doesn't have netcfg and dhcpcd binary, so I pushed these two
>> commands to system.
>> with 'netcfg eth0 up' and 'netcfg eth0 dhcp', I can get IP address, but
>> client cannot connect to this ip(time out).
>>
>> and when running 'netcfg eth0 dhcp', the terminal will output failed log
>> "action 'dhcp' failed (Network is unreachable)".
>>
>> What do you think of it? Is there a know method to enable tcp adb in
>> terminal without depending on framework?
> Honestly speaking I didn't try that.
> I'll give a try later.
diff mbox

Patch

diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk
index bf0611b..955bd53 100644
--- a/amdgpu/Android.mk
+++ b/amdgpu/Android.mk
@@ -10,5 +10,11 @@  LOCAL_SHARED_LIBRARIES := libdrm
 
 LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES)
 
+LOCAL_CFLAGS := \
+	-DAMDGPU_ASIC_ID_TABLE=\"/etc/hwdata/amdgpu.ids\" \
+	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids)
+
+LOCAL_REQUIRED_MODULES := amdgpu.ids
+
 include $(LIBDRM_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)