spirv: consistently use ifndef guards over pragma once

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 43766bf8c57a9b383c0d30cd054adddfa93e6877..04045bd5a67781b36ae3ea94650505ec5cbef242 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,13 +21,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# use c99 compiler by default
-ifeq ($(LOCAL_CC),)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CC := $(HOST_CC) -std=c99 -D_GNU_SOURCE
-else
-LOCAL_CC := $(TARGET_CC) -std=c99
-endif
+LOCAL_CFLAGS += -D_GNU_SOURCE
 endif
 
 LOCAL_C_INCLUDES += \
@@ -37,11 +32,18 @@ LOCAL_C_INCLUDES += \
 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
+       -Wno-unused-parameter \
+       -Wno-date-time \
+       -Wno-pointer-arith \
+       -Wno-missing-field-initializers \
+       -Wno-initializer-overrides \
+       -Wno-mismatched-tags \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
+       -DENABLE_SHADER_CACHE \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
@@ -49,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 \
@@ -56,33 +59,71 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_CLZLL \
        -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
+
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
        -DUSE_X86_ASM \
-       -DHAVE_DLOPEN \
 
 endif
 endif
 
 ifeq ($(MESA_ENABLE_LLVM),true)
-LOCAL_CFLAGS += \
-       -DHAVE_LLVM=0x0305 -DLLVM_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) \
        -Wno-error=non-virtual-dtor \
        -Wno-non-virtual-dtor
 
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+  LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+  LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+else
+  LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+endif
+
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false
 
 ifeq ($(strip $(LOCAL_MODULE_TAGS)),)
 LOCAL_MODULE_TAGS := optional
 endif
+
+# Quiet down the build system and remove any .h files from the sources
+LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
+
+LOCAL_SHARED_LIBRARIES += libz