Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

[android-x86/device-generic-goldfish-opengl.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index d44bab9..95b70ad 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -28,6 +28,8 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 18 && echo PreJellyBeanMr2),PreJe
     ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
         EMUGL_COMMON_CFLAGS += -DHAVE_ARM_TLS_REGISTER
     endif
+endif
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 16 && echo PreJellyBean),PreJellyBean)
     EMUGL_COMMON_CFLAGS += -DALOG_ASSERT=LOG_ASSERT
     EMUGL_COMMON_CFLAGS += -DALOGE=LOGE
     EMUGL_COMMON_CFLAGS += -DALOGW=LOGW