OSDN Git Service

enable java/jni build in PDK if supported
authorKeun young Park <keunyoung@google.com>
Wed, 8 Aug 2012 00:09:19 +0000 (17:09 -0700)
committerKeun young Park <keunyoung@google.com>
Wed, 8 Aug 2012 00:09:19 +0000 (17:09 -0700)
- testFramerate requires platform java API
  while all other tests only need SDK support

Change-Id: Iaefe23c41b3ace87522b5deefd6db2f5d80ed872

opengl/tests/Android.mk

index 071c679..3ae3b4e 100644 (file)
@@ -20,7 +20,7 @@ dirs := \
        textures \
        tritex \
 
-ifneq ($(TARGET_BUILD_PDK), true)
+ifneq (,$(TARGET_BUILD_JAVA_SUPPORT_LEVEL))
 dirs += \
        gl2_cameraeye \
        gl2_java \
@@ -29,11 +29,16 @@ dirs += \
        gl_jni \
        gl_perfapp \
        lighting1709 \
-       testFramerate \
        testLatency \
        testPauseResume \
        testViewport \
 
-endif
+endif # JAVA_SUPPORT
+
+ifeq (platform,$(TARGET_BUILD_JAVA_SUPPORT_LEVEL))
+dirs += \
+       testFramerate
+
+endif # JAVA_SUPPORT platform
 
 include $(call all-named-subdir-makefiles, $(dirs))