Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 01423887562efdc512dda98314aa90478a07a384..7b397e225df6dff184ad54ff65d65a719d622dc4 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -162,7 +162,7 @@ |
}, |
{ |
'target_name': 'content_unittests', |
- 'type': 'executable', |
+ 'type': '<(gtest_target_type)', |
'defines!': ['CONTENT_IMPLEMENTATION'], |
'dependencies': [ |
'content_browser', |
@@ -396,6 +396,11 @@ |
'browser/geolocation/wifi_data_provider_linux_unittest.cc', |
], |
}], |
+ ['OS == "android" and "<(gtest_target_type)" == "shared_library"', { |
+ 'dependencies': [ |
+ '../testing/android/native_test.gyp:native_test_native_code', |
+ ] |
+ }], |
], |
}, |
{ |
@@ -536,5 +541,28 @@ |
} |
], |
}], |
+ # Special target to wrap a <(gtest_target_type)==shared_library |
+ # content_unittests into an android apk for execution. |
+ # See base.gyp for TODO(jrg)s about this strategy. |
+ ['OS == "android" and "<(gtest_target_type)" == "shared_library"', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'content_unittests_apk', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'content_unittests', |
Ryan Sleevi
2012/05/23 23:09:24
Since you're directly depending on the build produ
nilesh
2012/05/23 23:55:40
I should have thought of this. Done. Thanks.
|
+ ], |
+ 'variables': { |
+ 'test_suite_name': 'content_unittests', |
+ 'input_shlib': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)', |
+ 'input_jars': [ |
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', |
+ '<(PRODUCT_DIR)/lib.java/chromium_content.jar', |
+ ], |
+ }, |
+ 'includes': [ '../build/apk_test.gypi' ], |
+ }, |
+ ], |
+ }], |
], |
} |