diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 22:04:57 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 22:04:57 -0700 |
| commit | 1b28d26ae9e49ec3c66777737c92b26c893ae629 (patch) | |
| tree | 2a51c86c705b402d6b303403d6b30332f7cea41b /opengl | |
| parent | 4c279770347b387890bb9eb90d9c96ad07e6f9e9 (diff) | |
| parent | 4fb69770e70352c987cc79414db7a03b52296ca7 (diff) | |
| download | frameworks_base-1b28d26ae9e49ec3c66777737c92b26c893ae629.zip frameworks_base-1b28d26ae9e49ec3c66777737c92b26c893ae629.tar.gz frameworks_base-1b28d26ae9e49ec3c66777737c92b26c893ae629.tar.bz2 | |
am 4fb69770: Merge change 5024 into donut
Merge commit '4fb69770e70352c987cc79414db7a03b52296ca7'
* commit '4fb69770e70352c987cc79414db7a03b52296ca7':
Remove opengl tests from tests build
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/angeles/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/tests/filter/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/finish/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/textures/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/tritex/Android.mk | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/opengl/tests/angeles/Android.mk b/opengl/tests/angeles/Android.mk index 46958d3..e193483 100644 --- a/opengl/tests/angeles/Android.mk +++ b/opengl/tests/angeles/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= app-linux.c demo.c.arm LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM libui LOCAL_MODULE:= angeles -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) @@ -13,5 +13,5 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= gpustate.c LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM LOCAL_MODULE:= gpustate -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/filter/Android.mk b/opengl/tests/filter/Android.mk index a448f0d..31b7d9a 100644 --- a/opengl/tests/filter/Android.mk +++ b/opengl/tests/filter/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-filter -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk index 26836c1..8b46cd7 100644 --- a/opengl/tests/finish/Android.mk +++ b/opengl/tests/finish/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-finish -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/textures/Android.mk b/opengl/tests/textures/Android.mk index a8c6220..8d5f56d 100644 --- a/opengl/tests/textures/Android.mk +++ b/opengl/tests/textures/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-textures -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/tritex/Android.mk b/opengl/tests/tritex/Android.mk index 5cd1f04..76fd8dd 100644 --- a/opengl/tests/tritex/Android.mk +++ b/opengl/tests/tritex/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-tritex -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) |