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

* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64
This commit is contained in:
Greg Hackmann
2014-03-18 12:25:45 -07:00
committed by Android Git Automerger

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.