diff options
| author | Mauro Rossi <[email protected]> | 2017-01-12 01:14:12 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-01-18 16:28:59 +0000 |
| commit | 730574c58e84306be04c4b82e38f201d6ed37c99 (patch) | |
| tree | d883e7c549b8f0787c731d727fff014b7ed7e96d | |
| parent | 02185a1c9b4cb25a197d65d2a724eb7d26b5d691 (diff) | |
android: ac/debug: move sid_tables.h generation and IB decode to amd/common
This patch is the porting to android of the following commits:
b838f64 "ac/debug: Move sid_tables.h generation to common code."
0ef1b4d "ac/debug: Move IB decode to common code."
Fixes android building errors due to sid_tables.h
and ac_debug.c, ac_debug.h moved to amd/common
Tested by building nougat-x86
Acked-by: Nicolai Hähnle <[email protected]>
Acked-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/amd/Android.common.mk | 16 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Android.mk | 15 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 8dcb42fb438..dfa7e59e9a2 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -28,16 +28,30 @@ 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/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary \ + $(intermediates)/common \ external/llvm/include \ external/llvm/device/include \ external/libcxx/include \ diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index b32c8dc3978..d8bc990de4b 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -32,21 +32,12 @@ LOCAL_SRC_FILES := $(C_SOURCES) LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions -LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/amd/common \ + $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_amd_common)/common LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeonsi -# generate sources -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) - -$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2) -$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ - -$(intermediates)/sid_tables.h: $(intermediates)/%.h: $(LOCAL_PATH)/%.py $(MESA_TOP)/src/amd/common/sid.h - $(transform-generated-source) - include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |