[Mesa-dev] [PATCH 5/5] Android: disable AMD common when LLVM is disabled

Rob Herring robh at kernel.org
Mon Mar 20 01:33:27 UTC 2017


LLVM enabled builds are broken with AOSP master. If building all targets
using "mmma external/mesa3d", the libmesa_amd_common will get built and
fail due to LLVM dependencies. Fix this by making it dependent on
MESA_ENABLE_LLVM.

Signed-off-by: Rob Herring <robh at kernel.org>
---
 src/amd/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/amd/Android.mk b/src/amd/Android.mk
index 07af05287f24..dcbc7a825458 100644
--- a/src/amd/Android.mk
+++ b/src/amd/Android.mk
@@ -26,4 +26,6 @@ LOCAL_PATH := $(call my-dir)
 include $(LOCAL_PATH)/Makefile.sources
 
 include $(LOCAL_PATH)/Android.addrlib.mk
+ifeq ($(MESA_ENABLE_LLVM),true)
 include $(LOCAL_PATH)/Android.common.mk
+endif
-- 
2.10.1



More information about the mesa-dev mailing list