radeonsi: move kill intrinsic building into amd/common

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index dee22dae097aab40c9a4b68871db13bca8574faf..611162ab9a9c2ee0ad8be2ca0c92b5f609cff51b 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -43,7 +43,7 @@ LOCAL_CFLAGS += \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
-       -D__STDC_LIMIT_MACROS \
+       -DENABLE_SHADER_CACHE \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
@@ -51,6 +51,7 @@ LOCAL_CFLAGS += \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
+       -DHAVE_FUNC_ATTRIBUTE_ALIAS \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -59,9 +60,15 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
+       -DHAVE_DL_ITERATE_PHDR \
        -fvisibility=hidden \
        -Wno-sign-compare
 
+LOCAL_CPPFLAGS += \
+       -D__STDC_CONSTANT_MACROS \
+       -D__STDC_FORMAT_MACROS \
+       -D__STDC_LIMIT_MACROS
+
 # mesa requires at least c99 compiler
 LOCAL_CONLYFLAGS += \
        -std=c99
@@ -75,18 +82,27 @@ endif
 endif
 
 ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_CFLAGS += \
-       -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
-       -D__STDC_CONSTANT_MACROS \
-       -D__STDC_FORMAT_MACROS \
-       -D__STDC_LIMIT_MACROS
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),5)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
+    ELF_INCLUDES := external/elfutils/0.153/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/src/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/libelf
+  endif
 endif
 
+ifneq ($(LOCAL_IS_HOST_MODULE),true)
 # add libdrm if there are hardware drivers
 ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
 LOCAL_CFLAGS += -DHAVE_LIBDRM
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
+endif
 
 LOCAL_CPPFLAGS += \
        $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \