From 56c6cdc9e71771d0fcdecabbe62d45a36f2d03b4 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Thu, 20 Dec 2012 14:14:51 -0800 Subject: [PATCH] android: Define Make variables for Android version MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Chad Versace --- Android.common.mk | 4 +--- Android.mk | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Android.common.mk b/Android.common.mk index 18e5726fa0a..d0a5f1aa413 100644 --- 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 6a3014c81bb..80c0e1395fb 100644 --- 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 -- 2.30.2