diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-06-05 06:47:42 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-05 06:47:42 -0700 |
| commit | 4a68ff8955ed3d984d01dc2fa3388e7d4432fdda (patch) | |
| tree | abe7a359895254c734b0a800bf4ffa0001ab0056 | |
| parent | d1878a571fb5c452250a4408cd3c221e64e7f662 (diff) | |
| parent | 0908a8735b884541889e0ffc283dda5c8d4493da (diff) | |
| download | sdk-4a68ff8955ed3d984d01dc2fa3388e7d4432fdda.zip sdk-4a68ff8955ed3d984d01dc2fa3388e7d4432fdda.tar.gz sdk-4a68ff8955ed3d984d01dc2fa3388e7d4432fdda.tar.bz2 | |
Merge "[MIPS] Allow tests to be built for MIPS"
| -rw-r--r-- | emulator/opengl/system/egl/Android.mk | 2 | ||||
| -rw-r--r-- | emulator/opengl/tests/gles_android_wrapper/Android.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/emulator/opengl/system/egl/Android.mk b/emulator/opengl/system/egl/Android.mk index 6778abe..b9c9749 100644 --- a/emulator/opengl/system/egl/Android.mk +++ b/emulator/opengl/system/egl/Android.mk @@ -37,6 +37,6 @@ LOCAL_MODULE_TAGS := debug LOCAL_MODULE_CLASS := ETC include $(BUILD_PREBUILT) -endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86 google_sdk google_sdk_x86) +endif # TARGET_PRODUCT in 'full sdk full_x86 full_mips sdk_x86 sdk_mips google_sdk google_sdk_x86 google_sdk_mips) endif # BUILD_EMULATOR_OPENGL_DRIVER != false diff --git a/emulator/opengl/tests/gles_android_wrapper/Android.mk b/emulator/opengl/tests/gles_android_wrapper/Android.mk index f7c8fed..f5254b7 100644 --- a/emulator/opengl/tests/gles_android_wrapper/Android.mk +++ b/emulator/opengl/tests/gles_android_wrapper/Android.mk @@ -48,7 +48,7 @@ $(call emugl-end-module) # Other builds are device-specific and will provide their own # version of this file to point to the appropriate HW EGL libraries. # -ifneq (,$(filter full full_x86 sdk sdk_x86,$(TARGET_PRODUCT))) +ifneq (,$(filter full full_x86 full_mips sdk sdk_x86 sdk_mips,$(TARGET_PRODUCT))) ifeq (,$(BUILD_EMULATOR_OPENGL_DRIVER)) include $(CLEAR_VARS) @@ -61,7 +61,7 @@ LOCAL_MODULE_CLASS := ETC include $(BUILD_PREBUILT) endif # building 'real' driver BUILD_EMULATOR_OPENGL_DRIVER -endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86' +endif # TARGET_PRODUCT in 'full sdk full_x86 sdk_x86 full_mips sdk_mips' #### gles_emul.cfg #### include $(CLEAR_VARS) |