diff --git a/core/main.mk b/core/main.mk
index b4282ee..7f37f0e 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -390,6 +390,7 @@
 	development/host \
 	development/tools/etc1tool \
 	development/tools/line_endings \
+	development/tools/emulator/opengl \
 	external/easymock \
 	external/expat \
 	external/libpng \
diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 3ba648d..c8a0569 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -36,3 +36,6 @@
 ifeq ($(HOST_OS),linux)
 WITH_DEXPREOPT := true
 endif
+
+# Build OpenGLES emulation guest and host libraries
+BUILD_EMULATOR_OPENGL := true
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 0206434..5b6d50f 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -26,3 +26,6 @@
 ifeq ($(HOST_OS),linux)
 WITH_DEXPREOPT := true
 endif
+
+# Build OpenGLES emulation host and guest libraries
+BUILD_EMULATOR_OPENGL := true