summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2012-03-27 10:28:58 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-03-27 10:28:58 -0700
commitbb6755687192a33cb1c3a3397d44305ffc7e86cd (patch)
tree9a98371c7257390c3e4dc49e5ac975fb00058052
parent1bb69f015c0fda0227e36d7ce39826409c9a0e8d (diff)
parent9f64c2a9e448f2b39369782c77add9c33e2c605d (diff)
Merge "frameworks/native: prevent some opengl tests from building in pdk"
-rw-r--r--opengl/tests/Android.mk40
1 files changed, 39 insertions, 1 deletions
diff --git a/opengl/tests/Android.mk b/opengl/tests/Android.mk
index 5053e7d643..071c6792e7 100644
--- a/opengl/tests/Android.mk
+++ b/opengl/tests/Android.mk
@@ -1 +1,39 @@
-include $(call all-subdir-makefiles)
+dirs := \
+ angeles \
+ configdump \
+ EGLTest \
+ fillrate \
+ filter \
+ finish \
+ gl2_basic \
+ gl2_copyTexImage \
+ gl2_yuvtex \
+ gl_basic \
+ gl_perf \
+ gl_yuvtex \
+ gralloc \
+ hwc \
+ include \
+ lib \
+ linetex \
+ swapinterval \
+ textures \
+ tritex \
+
+ifneq ($(TARGET_BUILD_PDK), true)
+dirs += \
+ gl2_cameraeye \
+ gl2_java \
+ gl2_jni \
+ gldual \
+ gl_jni \
+ gl_perfapp \
+ lighting1709 \
+ testFramerate \
+ testLatency \
+ testPauseResume \
+ testViewport \
+
+endif
+
+include $(call all-named-subdir-makefiles, $(dirs))