Merge "Revert "HACK: disable emulator on x86_64""

This commit is contained in:
Greg Hackmann 2014-04-02 22:53:45 +00:00 committed by Gerrit Code Review
commit f175087608
1 changed files with 2 additions and 2 deletions

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.