Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index f7f595156e16e9392ebc051d0fd6f6c9182c653d..d4513676317820c36ba1943d78342a0443216ad6 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -735,6 +735,25 @@ |
}, |
], |
'conditions': [ |
+ ['OS == "android" and gtest_target_type == "shared_library"', { |
+ 'targets': [ |
cjhopman
2013/08/30 18:24:28
Move this target down by the other *_apk targets
no sievers
2013/09/03 20:10:59
Done.
|
+ { |
+ 'target_name': 'content_gl_tests_apk', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'content_gl_tests', |
+ 'content_java_test_support', |
+ ], |
+ 'variables': { |
+ 'test_suite_name': 'content_gl_tests', |
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_gl_tests<(SHARED_LIB_SUFFIX)', |
+ }, |
+ 'includes': [ |
+ '../build/apk_test.gypi', |
+ ], |
+ }, |
+ ], |
+ }], |
['OS!="ios"', { |
'targets': [ |
{ |
@@ -1015,6 +1034,13 @@ |
'common/gpu/client/gl_helper_unittests.cc', |
'common/gpu/client/gpu_in_process_context_tests.cc', |
], |
+ 'conditions': [ |
+ ['OS=="android"', { |
+ 'dependencies': [ |
+ '../testing/android/native_test.gyp:native_test_native_code', |
+ ], |
+ }], |
+ ], |
}, |
{ |
'target_name': 'content_gl_benchmark', |