vulkan/util: fix typo in comment

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 98d98ee7ce5a822e10ae603099fe8ed2fd0fbba0..6bd30816bc41d5e21e6d58faa0419f522b480800 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -37,6 +37,7 @@ LOCAL_CFLAGS += \
        -Wno-missing-field-initializers \
        -Wno-initializer-overrides \
        -Wno-mismatched-tags \
+       -DVERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"
 
@@ -44,6 +45,7 @@ LOCAL_CFLAGS += \
 # It's likely due to a bug elsewhere, but let's temporarily add them
 # here to fix the radeonsi build.
 LOCAL_CFLAGS += \
+       -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
        -DENABLE_SHADER_CACHE \
        -D__STDC_CONSTANT_MACROS \
        -D__STDC_LIMIT_MACROS \
@@ -64,6 +66,7 @@ LOCAL_CFLAGS += \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
        -DHAVE_DL_ITERATE_PHDR \
+       -DMAJOR_IN_SYSMACROS \
        -fvisibility=hidden \
        -Wno-sign-compare
 
@@ -86,28 +89,10 @@ LOCAL_CFLAGS += \
 endif
 endif
 
-ifeq ($(MESA_ENABLE_LLVM),true)
-  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_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)\"
@@ -121,7 +106,3 @@ endif
 
 # Quiet down the build system and remove any .h files from the sources
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
-
-ifneq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_SHARED_LIBRARIES += libz
-endif