summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-04-02 22:53:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-02 22:53:45 +0000
commitf17508760898e0debeb4ae7ff6455d664577c647 (patch)
tree59520561618de601aa09b18ad586505bfb9a214e /target
parent45db0e058a8b0177b442b195a6ca5590525fb701 (diff)
parentdc01136beabf08032154a4140fcefbcbfeb20e7b (diff)
downloadbuild-f17508760898e0debeb4ae7ff6455d664577c647.zip
build-f17508760898e0debeb4ae7ff6455d664577c647.tar.gz
build-f17508760898e0debeb4ae7ff6455d664577c647.tar.bz2
Merge "Revert "HACK: disable emulator on x86_64""
Diffstat (limited to 'target')
-rwxr-xr-xtarget/board/generic_x86_64/BoardConfig.mk4
1 files changed, 2 insertions, 2 deletions
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 @@ 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.