diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-05-11 09:15:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-11 09:15:40 +0000 |
| commit | af61219ead61343570703f063498e05f1855d85b (patch) | |
| tree | 6d795795d6de8450a087099e89eda9e990a5816d /emulator | |
| parent | 5e3355f6e323c34d09a900ddbd7b2c336adea419 (diff) | |
| parent | 4bd21632595e8fcb7290a9c84667a88b2732da49 (diff) | |
| download | sdk-af61219ead61343570703f063498e05f1855d85b.zip sdk-af61219ead61343570703f063498e05f1855d85b.tar.gz sdk-af61219ead61343570703f063498e05f1855d85b.tar.bz2 | |
Merge "emulator: Do not build emulator-related modules with platform-build."
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/opengl/Android.mk | 9 |
1 files 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 |