diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2019-06-25 17:11:12 +0800 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2019-07-10 08:56:28 +0200 |
| commit | a74285def252076ac49daa4e4333735bca034f01 (patch) | |
| tree | 21b20289f474da76a759fbc70338c38a215dbb9e | |
| parent | f982c6789cfc0b4fbf29e070c480b74d758b72a3 (diff) | |
| download | mesa-a74285def252076ac49daa4e4333735bca034f01.tar.gz | |
android: radv: import include paths from used libraries
It's unnecessary to manually add these include paths since they could
be imported 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>
| -rw-r--r-- | src/amd/vulkan/Android.mk | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index 52993ccfa1b..322620f36ef 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -33,8 +33,6 @@ RADV_COMMON_INCLUDES := \ $(MESA_TOP)/src/vulkan/wsi \ $(MESA_TOP)/src/vulkan/util \ $(MESA_TOP)/src/amd \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/compiler \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/mesa/drivers/dri/common \ @@ -66,14 +64,12 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR $(call mesa-build-with-llvm) -LOCAL_C_INCLUDES := \ - $(RADV_COMMON_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_util,,) +LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES) LOCAL_STATIC_LIBRARIES := \ + libmesa_amd_common \ + libmesa_nir \ + libmesa_util \ libmesa_vulkan_util \ libmesa_git_sha1 @@ -146,9 +142,7 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR $(call mesa-build-with-llvm) -LOCAL_C_INCLUDES := \ - $(RADV_COMMON_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) +LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_util \ |