glsl/build: Build tests via the glsl Makefile

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 1e9f040ac078ccd93a5cbda2eb45a2faaf510497..d0a5f1aa413164fc03aa156c71bb2c0888afca4f 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -34,13 +34,11 @@ 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 += \
-       -DPTHREADS \
+       -DHAVE_PTHREAD=1 \
        -fvisibility=hidden \
        -Wno-sign-compare