commit c217d7b7c1aa1ec553c6bb97b7534df0aa20433e
author Greg Hackmann <ghackmann@google.com> Tue Mar 18 20:53:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 18 20:53:00 2014 +0000
tree 3a5fa78d55dae8ee83c3d7e834f8b30507299514
parent 145374e097034b886fcb040b0b1aef381304efb4
parent 6099a84f14804d741f0574c0c211b507d2ae21ae

am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '6099a84f14804d741f0574c0c211b507d2ae21ae':
  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 5e808e2..b58336a 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
 
-# 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.