Android: amd: use exported include dirs instead of explicit includes

[mesa.git] / src / amd / Android.common.mk

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index df65c24d50ce27b3b122c9a855476bd75a8fb8af..a770aca650056c31959afddc83853b785787e24b 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -28,18 +28,38 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libmesa_amd_common
 
-LOCAL_SRC_FILES := $(AMD_COMPILER_FILES)
+LOCAL_SRC_FILES := \
+       $(AMD_COMPILER_FILES) \
+       $(AMD_DEBUG_FILES)
+
+LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare LLVMInitializeAMDGPU* functions
+
+# generate sources
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+intermediates := $(call local-generated-sources-dir)
+LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES))
+
+$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
+$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
+
+$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
+       $(transform-generated-source)
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include \
        $(MESA_TOP)/src \
        $(MESA_TOP)/src/amd/common \
+       $(MESA_TOP)/src/compiler \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary \
+       $(intermediates)/common \
        external/llvm/include \
        external/llvm/device/include \
-       external/libcxx/include \
-       external/elfutils/$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),src/))libelf
+       $(ELF_INCLUDES)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(LOCAL_PATH)/common
 
 LOCAL_STATIC_LIBRARIES := libLLVMCore