Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 01423887562efdc512dda98314aa90478a07a384..03a41c2a7f3b17976bd15824ed2dfa9448998378 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"', { |
Ryan Sleevi
2012/05/23 01:00:45
Test _component (rather than "<(gtest_target_type)
nilesh
2012/05/23 22:45:20
If I understand correctly, using component would r
Ryan Sleevi
2012/05/23 23:09:24
Sorry, I had meant _type (the automatic variable f
|
+ 'dependencies': [ |
+ '../testing/android/native_test.gyp:native_test_native_code', |
+ ] |
+ }], |
], |
}, |
{ |
@@ -536,5 +541,24 @@ |
} |
], |
}], |
+ # 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', |
+ ], |
+ 'variables': { |
+ 'test_suite_name': 'content_unittests', |
+ 'jar_name': 'chromium_base.jar', |
Ryan Sleevi
2012/05/23 01:00:45
You probably want to rename jar_name to something
nilesh
2012/05/23 22:45:20
Done.
|
+ }, |
+ 'includes': [ '../build/apk_test.gypi' ], |
+ }, |
+ ], |
+ }], |
], |
} |