diff options
| -rw-r--r-- | Android.common.mk | 4 | ||||
| -rw-r--r-- | 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 \ @@ -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 |