Export the correct include path so that the libraries use it can
get it automatically.
Signed-off-by: Chih-Wei Huang <cwhu...@linux.org.tw>
---
src/amd/vulkan/Android.mk | 1 -
src/intel/Android.vulkan.mk | 1 -
src/vulkan/Android.mk | 3 +--
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
index 4290cc0..52993cc 100644
--- 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 4fff842..5083fec 100644
--- 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 99dd3f5..c3230d8 100644
--- 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
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
