[Mesa-dev] [PATCH] android: anv: drop libdrm_intel dependency

[Emil Velikov]

On 29 June 2017 at 09:21, Lionel Landwerlin
<lionel.g.landwerlin at intel.com> wrote:
> Not an expert on the android build system, I have a question below.
> Otherwise :
>
> Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
>
> Thanks!
>
> On 29/06/17 01:46, Mauro Rossi wrote:
>>
>> In addition to Rob Herring "Android: i965: remove libdrm_intel
>> dependency",
>> we can drop libdrm_intel dependency in anv for Android.
>>
>> Please check if libdrm has to stay as shared dependency and drop this
>> comment line.
>>
>> Fixes: 7dd20bc ("anv/i965: drop libdrm_intel dependency completely")
>> ---
>>   src/intel/Android.vulkan.mk          |  3 ++-
>>   1 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
>> index 095a75bbd4..8f8366aa7f 100644
>> --- a/src/intel/Android.vulkan.mk
>> +++ b/src/intel/Android.vulkan.mk
>> @@ -33,6 +33,7 @@ VULKAN_COMMON_INCLUDES := \
>>         $(MESA_TOP)/src/vulkan/wsi \
>>         $(MESA_TOP)/src/vulkan/util \
>>         $(MESA_TOP)/src/intel \
>> +       $(MESA_TOP)/src/intel/drm \
>>         $(MESA_TOP)/src/intel/vulkan
>>     # libmesa_anv_entrypoints with header and dummy.c
>> @@ -93,7 +94,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES)
>>     LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
>>   -LOCAL_SHARED_LIBRARIES := libdrm_intel
>> +LOCAL_SHARED_LIBRARIES := libdrm
>
>
> Wasn't libdrm already linked against? As far as I can tell it was with
> autotools.
>
Leaning towards no here. IIRC Android does not pass --as-needed to the
linker (or was it some other option) so the missing direct dependency
did not flag. And since libdrm_intel depends on libdrm it is
implicitly resolved :-\

Thanks Mauro I'll push the fix in a moment.

-Emil