diff options
| author | Keun young Park <keunyoung@google.com> | 2012-08-08 12:25:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-08 12:25:15 -0700 |
| commit | a610da900cf67f0cbd323c60a0dd55827df8313a (patch) | |
| tree | 0765f42835a4c86a08cd02e7bda6a2fa9530ac53 /opengl/tests | |
| parent | b685c542836b93c99cd85053e07696406ea37adb (diff) | |
| parent | 203a3357c7042680304e3821b1f6ed1aea8c17cd (diff) | |
| download | frameworks_native-a610da900cf67f0cbd323c60a0dd55827df8313a.zip frameworks_native-a610da900cf67f0cbd323c60a0dd55827df8313a.tar.gz frameworks_native-a610da900cf67f0cbd323c60a0dd55827df8313a.tar.bz2 | |
Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/opengl/tests/Android.mk b/opengl/tests/Android.mk index 071c679..3ae3b4e 100644 --- a/opengl/tests/Android.mk +++ b/opengl/tests/Android.mk @@ -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)) |