diff options
| author | Rob Herring <robh@kernel.org> | 2017-05-03 14:35:24 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-05-11 13:52:21 +0100 |
| commit | 26aee6f4d5a28350e1f6becfc485ce929c4126f9 (patch) | |
| tree | 2c1cc45feae6fc8dec6e3da62de74f4891db8293 /Android.common.mk | |
| parent | e2ff12e919b5f887083225d96f4060a122c12eab (diff) | |
Android: rework LLVM build support
Currently, building with "mmma external/mesa3d" which builds all targets
and dependencies is broken for targets that require LLVM. This is due to
the build settings depending on MESA_ENABLE_LLVM. Instead of using a
conditional in the global Android.common.mk, make all the components that
need LLVM explicitly include the necessary build settings.
GALLIVM_CPP_SOURCES doesn't exist anymore, so remove that as well.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Android.common.mk b/Android.common.mk index eb9a3f0e87..5e7fd9445a 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -86,15 +86,6 @@ LOCAL_CFLAGS += \ endif endif -ifeq ($(MESA_ENABLE_LLVM),true) - ifeq ($(MESA_ANDROID_MAJOR_VERSION),6) - LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0 - endif - ifeq ($(MESA_ANDROID_MAJOR_VERSION),7) - LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0 - endif -endif - ifneq ($(LOCAL_IS_HOST_MODULE),true) LOCAL_CFLAGS += -DHAVE_LIBDRM LOCAL_SHARED_LIBRARIES += libdrm |