aboutsummaryrefslogtreecommitdiffstats
path: root/src/amd/Android.common.mk
diff options
context:
space:
mode:
authorTimur Kristóf <[email protected]>2019-09-27 10:29:51 +0200
committerBas Nieuwenhuizen <[email protected]>2019-10-08 00:44:08 +0000
commit3a08110d43ce268747d034cae03787080967bf71 (patch)
treeee02037354a4a3846f9cb75df486b036345a5acc /src/amd/Android.common.mk
parent738bbee603fd3fd8ea29edab7b681e48bc981467 (diff)
amd: Move all amd/common code that depends on LLVM to amd/llvm.
This commit is a step towards the goal of being able to build RADV without LLVM. In the future we would like to offer the option to use RADV solely with ACO. There is still a need for the common AMD code located in amd/common but the LLVM specific parts need to be separated. Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Acked-by: Marek Olšák <[email protected]> Acked-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/amd/Android.common.mk')
-rw-r--r--src/amd/Android.common.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index d5a266215f0..f77aa79c7d8 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -30,9 +30,8 @@ LOCAL_MODULE := libmesa_amd_common
LOCAL_SRC_FILES := \
$(AMD_COMMON_FILES) \
- $(AMD_COMPILER_FILES) \
- $(AMD_DEBUG_FILES) \
- $(AMD_NIR_FILES)
+ $(AMD_COMMON_LLVM_FILES) \
+ $(AMD_DEBUG_FILES)
LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions
@@ -72,6 +71,7 @@ LOCAL_C_INCLUDES := \
$(MESA_TOP)/include \
$(MESA_TOP)/src \
$(MESA_TOP)/src/amd/common \
+ $(MESA_TOP)/src/amd/llvm \
$(MESA_TOP)/src/compiler \
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
$(MESA_TOP)/src/gallium/include \