android: vulkan/util: fix export path

Export the correct include path so that the libraries use it can
get it automatically.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
index 4290cc02b6771580e182aff02b0f60714d5782a9..52993ccfa1b8edd17118621f1a455f2cae5a868c 100644 (file)
--- a/src/amd/vulkan/Android.mk
+++ b/src/amd/vulkan/Android.mk
@@ -71,7 +71,6 @@ LOCAL_C_INCLUDES := \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,)
 
 LOCAL_STATIC_LIBRARIES := \

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 4fff842bc162c0d64bc673a92eb8d40a6b3943d7..5083fec3fd6f839492eb21322d63f04f7e76f612 100644 (file)
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -107,7 +107,6 @@ ANV_INCLUDES := \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
        $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
 
 ANV_SHARED_LIBRARIES := libdrm
 

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index 99dd3f56313f719be1a2b5d6af723039b3090d17..c3230d8288fa35875a171d1db527106b5b8ba417 100644 (file)
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -62,8 +62,7 @@ $(LOCAL_GENERATED_SOURCES): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
            --xml $(vulkan_api_xml) \
            --outdir $(dir $@)
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-        $(intermediates)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/util
 
 ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
 LOCAL_SHARED_LIBRARIES += libnativewindow