Merge "[GLESv3][VAO] enable/pointer for vertex attribs when possible"

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

diff --git a/Android.mk b/Android.mk
index 1e15265..566e737 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -24,14 +24,17 @@ EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender $(EMUGL_PATH
 #
 EMUGL_COMMON_CFLAGS := -DWITH_GLES2 -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 16 && echo PreJellyBean),PreJellyBean)
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 18 && echo PreJellyBeanMr2),PreJellyBeanMr2)
     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
     EMUGL_COMMON_CFLAGS += -DALOGD=LOGD
+    EMUGL_COMMON_CFLAGS += -DALOGV=LOGV
 endif
 
 # Uncomment the following line if you want to enable debug traces