am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64
This commit is contained in:
Greg Hackmann 2014-03-18 19:29:01 +00:00 committed by Android Git Automerger
commit b5169b4d75

View file

@ -33,8 +33,8 @@ ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true
endif
# Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true
# disable the emulator
BUILD_EMULATOR := false
# Build and enable the OpenGL ES View renderer. When running on the emulator,
# the GLES renderer disables itself if host GL acceleration isn't available.