commit f17508760898e0debeb4ae7ff6455d664577c647
author Greg Hackmann <ghackmann@google.com> Wed Apr 02 22:53:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 02 22:53:45 2014 +0000
tree 59520561618de601aa09b18ad586505bfb9a214e
parent 45db0e058a8b0177b442b195a6ca5590525fb701
parent dc01136beabf08032154a4140fcefbcbfeb20e7b

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

target/board/generic_x86_64/BoardConfig.mk

diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index 7f2715e..2ed83bb 100755
--- a/target/board/generic_x86_64/BoardConfig.mk
+++ b/target/board/generic_x86_64/BoardConfig.mk
@@ -33,8 +33,8 @@
 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.