[Mesa-dev] [PATCH] Vulkan: Android.mk: Android build fix

[Tapani Pälli]

On 02/27/2018 05:00 AM, Harish Krupo wrote:
> Hi Tapani,
> 
> Tapani Pälli <tapani.palli at intel.com> writes:
> 
>> On 02/20/2018 10:10 AM, Harish Krupo wrote:
>>> Signed-off-by: Harish Krupo <harish.krupo.kps at intel.com>
>>> ---
>>>    src/intel/Android.vulkan.mk | 3 ++-
>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
>>> index 6fe736d397..444278613d 100644
>>> --- a/src/intel/Android.vulkan.mk
>>> +++ b/src/intel/Android.vulkan.mk
>>> @@ -192,9 +192,10 @@ include $(CLEAR_VARS)
>>>    LOCAL_MODULE := libmesa_anv_gen11
>>>    LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>>>    -LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
>>> +LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
>>>    LOCAL_CFLAGS := -DGEN_VERSIONx10=110
>>>    +LOCAL_HEADER_LIBRARIES += libcutils_headers libsystem_headers
>>
>> Why add this 'libcutils_headers' only here for libmesa_anv_gen11 and not for
>> all?
>>
> 
> Sorry, missed sending those patches which added libcutils_headers to
> others.
> 
>> Please note following series (got r-b but has not landed yet):
>> https://patchwork.freedesktop.org/series/37625/
>>
>> I think we should land patch 2 from there before other changes.
>>
> 
> After Mauro's patches this change is no longer required as libnativewindow
> seems to pull in libcutils and liblog as dependencies. I guess this change
>   -LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
>   +LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES)
> is still required? Will submit a v2 with only that change.

Yes, we want that one!

>>>    LOCAL_C_INCLUDES := $(ANV_INCLUDES)
>>>      LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
>>>
> 
> Thank you
> 
> Regards
> Harish Krupo
>