aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2017-02-08 08:14:05 +0100
committerEmil Velikov <[email protected]>2017-02-20 16:23:13 +0000
commit933988901ab14b3c950272b60a56cb48265076b0 (patch)
tree4e878af59029d0d15048f38173c9c6138a0dad62
parent920b4d537f288957718d6c722ac478d7d2c52a47 (diff)
android: radeonsi: fix sid_table.h generated header include path
generated-sources-dir-for macro replaces intermediates-dir-for and LOCAL_MODULE_CLASS is defined as required by new macro, in order to avoid the following building error: external/mesa/src/gallium/drivers/radeonsi/si_debug.c:29:10: fatal error: 'sid_tables.h' file not found ^ 1 error generated. Fixes: 730574c58e8 ("android: ac/debug: move sid_tables.h generation and IB decode to amd/common") Acked-by: Nicolai Hähnle <[email protected]> Acked-by: Emil Velikov <[email protected]>
-rw-r--r--src/gallium/drivers/radeonsi/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk
index d8bc990de4b..b6f9e26fccc 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -32,9 +32,11 @@ LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/amd/common \
- $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_amd_common)/common
+ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common
LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_radeonsi