util/u_atomic: Add implementation of __sync_val_compare_and_swap_8

[android-x86/external-mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index cd57615..e899a31 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -59,13 +59,16 @@ LOCAL_CFLAGS += \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
        -DHAVE_DL_ITERATE_PHDR \
+       -DMAJOR_IN_SYSMACROS \
        -fvisibility=hidden \
        -Wno-sign-compare
 
 LOCAL_CPPFLAGS += \
        -D__STDC_CONSTANT_MACROS \
        -D__STDC_FORMAT_MACROS \
-       -D__STDC_LIMIT_MACROS
+       -D__STDC_LIMIT_MACROS \
+       -Wno-error=non-virtual-dtor \
+       -Wno-non-virtual-dtor
 
 # mesa requires at least c99 compiler
 LOCAL_CONLYFLAGS += \
@@ -102,17 +105,8 @@ 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
+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)\"
 
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false
@@ -123,7 +117,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