diff options
| author | Chih-Wei Huang <[email protected]> | 2019-06-20 15:51:44 +0800 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2019-07-10 08:56:10 +0200 |
| commit | 4338e08bd699ac5461532256469b4e79920063e9 (patch) | |
| tree | 42856894a25f3749d6399ee3ef74be246b247aa8 | |
| parent | e2ef281da14c2c735b3b82a7a405e9463aa74b67 (diff) | |
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 <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Acked-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/amd/vulkan/Android.mk | 1 | ||||
| -rw-r--r-- | src/intel/Android.vulkan.mk | 1 | ||||
| -rw-r--r-- | src/vulkan/Android.mk | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index 4290cc02b67..52993ccfa1b 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 4fff842bc16..5083fec3fd6 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 99dd3f56313..c3230d8288f 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 |