am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
  Revert "HACK: disable emulator on x86_64"
This commit is contained in:
Greg Hackmann
2014-04-02 23:04:57 +00:00
committed by Android Git Automerger

View File

@@ -33,8 +33,8 @@ ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT ?= true
endif
# disable the emulator
BUILD_EMULATOR := false
# Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true
# 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.