android: Define Make variables for Android version

Define the following Make variables:
    MESA_ANDROID_MAJOR_VERSION
    MESA_ANDROID_MINOR_VERSION
    MESA_ANDROID_VERSION

These variable will allow us to make version-dependent decisions on
library dependencies. In particular, building Mesa against JellyBean will
require libsync.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/Android.common.mk b/Android.common.mk
index 18e5726fa0ae78d999f6cf67db38d21d9d846592..d0a5f1aa413164fc03aa156c71bb2c0888afca4f 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -34,10 +34,8 @@ LOCAL_C_INCLUDES += \
        $(MESA_TOP)/include
 
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
-major := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
-minor := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 LOCAL_CFLAGS += \
-       -DANDROID_VERSION=0x0$(major)0$(minor)
+       -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
        -DHAVE_PTHREAD=1 \

diff --git a/Android.mk b/Android.mk
index 6a3014c81bb860fbfc3d4e7f25ccfb06c70f1f6f..80c0e1395fb596af897eab6f3ed1e76a24fb7d15 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,11 @@
 # module will also be built.  DRI modules will be loaded by libGLES_mesa.
 
 MESA_TOP := $(call my-dir)
+
+MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
+MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
+MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
+
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python