commit 8222dd66cf278c9a64b97d04afeabb094a27646b
author David 'Digit' Turner <digit@google.com> Sun May 11 09:16:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun May 11 09:16:23 2014 +0000
tree fb1b597859a4dcfe8db7f1e24bc9d81d1c0a8450
parent 667b203314687c49fe5205b474c6167f0f75dbc2
parent 56e5ebebd56a3a9de91a42c8a96c48ecde5f2a8c

am 56e5ebeb: Merge "Prepare for removal of platform builds."

* commit '56e5ebebd56a3a9de91a42c8a96c48ecde5f2a8c':
  Prepare for removal of platform builds.

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index 6d1ca2d..586797d 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -339,7 +339,9 @@
     $(error Cannot find GPU emulation sources directory: $(EMULATOR_EMUGL_SOURCES_DIR))
   endif
 
+  # TODO(digit): Remove the line below.
   BUILD_EMULATOR_OPENGL := true
+  BUILD_EMULATOR_HOST_OPENGL := true
   include $(EMULATOR_EMUGL_SOURCES_DIR)/Android.mk
 endif