android: simplify the subdirs including rules

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

diff --git a/Android.common.mk b/Android.common.mk
index c6ee4e1..527fe2f 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -31,15 +31,30 @@ endif
 endif
 
 LOCAL_C_INCLUDES += \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/include
 
+MESA_VERSION=$(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
-       -DPACKAGE_VERSION=\"9.2.0-devel\" \
+       -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 += \
+       -DHAVE___BUILTIN_EXPECT \
+       -DHAVE___BUILTIN_FFS \
+       -DHAVE___BUILTIN_FFSLL \
+       -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
+       -DHAVE_FUNC_ATTRIBUTE_UNUSED \
+       -DHAVE_FUNC_ATTRIBUTE_FORMAT \
+       -DHAVE_FUNC_ATTRIBUTE_PACKED \
+       -DHAVE___BUILTIN_CTZ \
+       -DHAVE___BUILTIN_POPCOUNT \
+       -DHAVE___BUILTIN_POPCOUNTLL \
+       -DHAVE___BUILTIN_CLZ \
+       -DHAVE___BUILTIN_CLZLL \
+       -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -fvisibility=hidden \
        -Wno-sign-compare