From: Chih-Wei Huang Date: Tue, 25 Jun 2019 09:11:12 +0000 (+0800) Subject: android: radv: import include paths from used libraries X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a74285def252076ac49daa4e4333735bca034f01;p=mesa.git 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 Acked-by: Eric Engestrom Acked-by: Emil Velikov --- 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 \