diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-04-03 01:41:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 01:41:16 +0000 |
| commit | b3f2dac1e07e43a57227e39f00474c82006eba7a (patch) | |
| tree | 24a4eef6929ff6cdada36fc4e78c14b5373ddd25 /target/board/generic_x86_64 | |
| parent | 9871d2e270781e3254d9b1b82d7e1e6a949172a3 (diff) | |
| parent | 0fd37501c4610783c53a6f8d4000ba7a230f61df (diff) | |
| download | build-b3f2dac1e07e43a57227e39f00474c82006eba7a.zip build-b3f2dac1e07e43a57227e39f00474c82006eba7a.tar.gz build-b3f2dac1e07e43a57227e39f00474c82006eba7a.tar.bz2 | |
am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '0fd37501c4610783c53a6f8d4000ba7a230f61df':
Revert "HACK: disable emulator on x86_64"
Diffstat (limited to 'target/board/generic_x86_64')
| -rwxr-xr-x | target/board/generic_x86_64/BoardConfig.mk | 4 |
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. |