From dc01136beabf08032154a4140fcefbcbfeb20e7b Mon Sep 17 00:00:00 2001
From: Greg Hackmann <ghackmann@google.com>
Date: Mon, 31 Mar 2014 16:54:52 -0700
Subject: [PATCH] Revert "HACK: disable emulator on x86_64"

This reverts commit 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.
---
 target/board/generic_x86_64/BoardConfig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index 7f2715efd..2ed83bb66 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.