Fix standalone emulator build.
- Allow building with OpenGL ES acceleration disabled, avoiding a
dependency on stuff outside the QEMU project.
- Allow the standalone configure.sh to provide the include/lib path
for the OpenGL ES libraries.
- Update the default OpenGL ES include path for standalone builds.
Change-Id: I03f4627af4c271783b65a116ceb5934385c68cdc
diff --git a/Makefile.common b/Makefile.common
index 5307b28..20b6fa7 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -164,7 +164,9 @@
common_LOCAL_CFLAGS =
common_LOCAL_SRC_FILES =
-EMULATOR_LIBUI_CFLAGS := -Isdk/emulator/opengl/host/include
+ifneq ($(QEMU_OPENGLES_INCLUDE),)
+ EMULATOR_LIBUI_CFLAGS := -I$(QEMU_OPENGLES_INCLUDE)
+endif
common_LOCAL_CFLAGS += $(EMULATOR_COMMON_CFLAGS)