summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-03-18 19:29:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-18 19:29:01 +0000
commitb5169b4d75e1e6dc4f59edca35c53ec384d174a4 (patch)
tree48c04c14faa436ee150e155a7be91dbd750bbb2d /target
parent882438698735696f3eb69626aae2822fccc30294 (diff)
parent5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e (diff)
downloadbuild-b5169b4d75e1e6dc4f59edca35c53ec384d174a4.zip
build-b5169b4d75e1e6dc4f59edca35c53ec384d174a4.tar.gz
build-b5169b4d75e1e6dc4f59edca35c53ec384d174a4.tar.bz2
am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e': 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 5e808e2..b58336a 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
-# 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.