aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.target
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-04-27 08:49:28 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-04-27 08:49:29 -0700
commit64aa3854587d4b9c3ca683c3380be220f71ba47b (patch)
tree190bdb0d954f3dbe952c94895d147c0df2145073 /Makefile.target
parent0c8a719be79b979a039abaf24432de6fbc9b13e6 (diff)
parent183e927350a14945e13ab217e16ab5dce20349f3 (diff)
downloadexternal_qemu-64aa3854587d4b9c3ca683c3380be220f71ba47b.zip
external_qemu-64aa3854587d4b9c3ca683c3380be220f71ba47b.tar.gz
external_qemu-64aa3854587d4b9c3ca683c3380be220f71ba47b.tar.bz2
Merge "Fix standalone emulator build."
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index f7122fa..45c8e69 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -274,8 +274,11 @@ LOCAL_CFLAGS += \
$(EMULATOR_TARGET_CFLAGS) \
-DCONFIG_STANDALONE_CORE \
-LOCAL_CFLAGS += -Isdk/emulator/opengl/host/include -Wno-missing-field-initializers
+ifneq ($(QEMU_OPENGLES_INCLUDE),)
+ LOCAL_CFLAGS += -I$(QEMU_OPENGLES_INCLUDE)
+endif
+LOCAL_CFLAGS += -Wno-missing-field-initializers
LOCAL_STATIC_LIBRARIES := \
emulator-libqemu \