diff --git a/opengl/tests/Android.mk b/opengl/tests/Android.mk
index 5053e7d64..071c6792e 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))