Make build script compatible with klp and up
It gets rid of c++11 and makes build script compatible with klp and up.
It also includes GL headers here, because headers in framework/native
might be different across API levels.
Change-Id: Ida425416a392cef878256965d69b54afe42b7263
diff --git a/Android.mk b/Android.mk
index 2e9e473..dad17d9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,13 +16,13 @@
# This is always set to a module's LOCAL_C_INCLUDES
# See the definition of emugl-begin-module in common.mk
#
-EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender
+EMUGL_COMMON_INCLUDES := $(EMUGL_PATH)/host/include/libOpenglRender $(EMUGL_PATH)/system/include
# common cflags used by several modules
# This is always set to a module's LOCAL_CFLAGS
# See the definition of emugl-begin-module in common.mk
#
-EMUGL_COMMON_CFLAGS := -DWITH_GLES2
+EMUGL_COMMON_CFLAGS := -DWITH_GLES2 -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
# Uncomment the following line if you want to enable debug traces
# in the GLES emulation libraries.