From 4bd21632595e8fcb7290a9c84667a88b2732da49 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 9 May 2014 14:47:54 +0200 Subject: emulator: Do not build emulator-related modules with platform-build. This patch removes the emulator modules from the Windows SDK build, as well as the GPU emulation library modules from emulator-specific platform builds. Note that these binaries and libraries are now directly built from sources through the emulator's own standalone build system, i.e.: cd external/qemu ./android-rebuild.sh Change-Id: I5fd1f154f5118c3d9eee80c24ffa45068d7cfc33 --- emulator/opengl/Android.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/emulator/opengl/Android.mk b/emulator/opengl/Android.mk index 6cab042..856826a 100644 --- a/emulator/opengl/Android.mk +++ b/emulator/opengl/Android.mk @@ -1,13 +1,10 @@ # This is the top-level build file for the Android HW OpenGL ES emulation # in Android. # -# You must define BUILD_EMULATOR_OPENGL to 'true' in your environment to +# You must define BUILD_EMULATOR_HOST_OPENGL to 'true' in your environment to # build the following files. # -# Also define BUILD_EMULATOR_OPENGL_DRIVER to 'true' to build the gralloc -# stuff as well. -# -ifeq (true,$(BUILD_EMULATOR_OPENGL)) +ifeq (true,$(BUILD_EMULATOR_HOST_OPENGL)) # Top-level for all modules EMUGL_PATH := $(call my-dir) @@ -104,4 +101,4 @@ include $(EMUGL_PATH)/tests/translator_tests/MacCommon/Android.mk include $(EMUGL_PATH)/tests/translator_tests/GLES_CM/Android.mk include $(EMUGL_PATH)/tests/translator_tests/GLES_V2/Android.mk -endif # BUILD_EMULATOR_OPENGL == true +endif # BUILD_EMULATOR_HOST_OPENGL == true -- cgit v1.1