Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-mesa: Commit

external/mesa


Commit MetaInfo

Revisionf978f901901feb4339ef00810f6a13dca0bfb321 (tree)
Time2019-10-05 20:24:26
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

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>

Change Summary

Incremental Difference

--- a/src/amd/vulkan/Android.mk
+++ b/src/amd/vulkan/Android.mk
@@ -33,8 +33,6 @@ RADV_COMMON_INCLUDES := \
3333 $(MESA_TOP)/src/vulkan/wsi \
3434 $(MESA_TOP)/src/vulkan/util \
3535 $(MESA_TOP)/src/amd \
36- $(MESA_TOP)/src/amd/common \
37- $(MESA_TOP)/src/compiler \
3836 $(MESA_TOP)/src/mapi \
3937 $(MESA_TOP)/src/mesa \
4038 $(MESA_TOP)/src/mesa/drivers/dri/common \
@@ -66,14 +64,12 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
6664
6765 $(call mesa-build-with-llvm)
6866
69-LOCAL_C_INCLUDES := \
70- $(RADV_COMMON_INCLUDES) \
71- $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,) \
72- $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
73- $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \
74- $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,)
67+LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES)
7568
7669 LOCAL_STATIC_LIBRARIES := \
70+ libmesa_amd_common \
71+ libmesa_nir \
72+ libmesa_util \
7773 libmesa_vulkan_util \
7874 libmesa_git_sha1
7975
@@ -146,9 +142,7 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
146142
147143 $(call mesa-build-with-llvm)
148144
149-LOCAL_C_INCLUDES := \
150- $(RADV_COMMON_INCLUDES) \
151- $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,)
145+LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES)
152146
153147 LOCAL_WHOLE_STATIC_LIBRARIES := \
154148 libmesa_util \
Show on old repository browser