diff options
| author | Chih-Wei Huang <[email protected]> | 2019-06-20 18:14:35 +0800 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2019-07-10 08:56:23 +0200 |
| commit | f982c6789cfc0b4fbf29e070c480b74d758b72a3 (patch) | |
| tree | 80162f99d4437a86d2a34835013ef24242eb72ce /src/intel | |
| parent | 5cb61f27d0b9e34c149775483873cfbdb4db8774 (diff) | |
android: anv: import include path of libmesa_nir
Add libmesa_nir to a common LOCAL_STATIC_LIBRARIES defined by
ANV_STATIC_LIBRARIES so that its include path can be imported
automatically. Then ANV_INCLUDES is unnecessary and could be
eliminated.
Signed-off-by: Chih-Wei Huang <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Acked-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/Android.vulkan.mk | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 450cf2efdda..5d2ec4f76c7 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -38,7 +38,6 @@ VULKAN_COMMON_INCLUDES := \ $(MESA_TOP)/src/vulkan/util \ $(MESA_TOP)/src/intel \ $(MESA_TOP)/src/intel/vulkan \ - $(MESA_TOP)/src/compiler \ frameworks/native/vulkan/include ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) @@ -53,9 +52,10 @@ VULKAN_COMMON_HEADER_LIBRARIES := \ libhardware_headers endif -ANV_INCLUDES := \ - $(VULKAN_COMMON_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ +ANV_STATIC_LIBRARIES := \ + libmesa_vulkan_common \ + libmesa_genxml \ + libmesa_nir ANV_SHARED_LIBRARIES := libdrm @@ -74,9 +74,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=70 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -95,9 +95,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=75 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -116,9 +116,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=80 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -137,9 +137,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=90 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -158,9 +158,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=100 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -179,9 +179,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_SRC_FILES := $(VULKAN_GEN11_FILES) LOCAL_CFLAGS := -DGEN_VERSIONx10=110 -LOCAL_C_INCLUDES := $(ANV_INCLUDES) +LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) -LOCAL_STATIC_LIBRARIES := libmesa_vulkan_common libmesa_genxml +LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) @@ -205,10 +205,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/vulkan LOCAL_C_INCLUDES := \ $(LOCAL_EXPORT_C_INCLUDE_DIRS) \ - $(ANV_INCLUDES) \ - $(MESA_TOP)/src/compiler + $(VULKAN_COMMON_INCLUDES) LOCAL_STATIC_LIBRARIES := \ + libmesa_nir \ libmesa_genxml \ libmesa_git_sha1 \ libmesa_vulkan_util |