Mesa (master): android: Define Make variables for Android version
Chad Versace
chadversary at kemper.freedesktop.org
Wed Jan 2 22:56:02 UTC 2013
Module: Mesa
Branch: master
Commit: 56c6cdc9e71771d0fcdecabbe62d45a36f2d03b4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56c6cdc9e71771d0fcdecabbe62d45a36f2d03b4
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Thu Dec 20 14:14:51 2012 -0800
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 at intel.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
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 18e5726..d0a5f1a 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 6a3014c..80c0e13 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
More information about the mesa-commit
mailing list