OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: anv: import include path of libmesa_nir

Browse Source 
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 <cwhuang@linux.org.tw>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Chih-Wei Huang
2019-06-20 18:14:35 +08:00
committed by Mauro Rossi
parent 5cb61f27d0
commit f982c6789c
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/intel/Android.vulkan.mk
View File

@@ -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