summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 04:36:03 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 04:36:03 +0000
commit3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2 (patch)
tree218cc259dceff97f4f9552e0733cedf38802296d /sync
parent4e4e5c75d09328664f8231277eca2d4918458832 (diff)
downloadchromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.zip
chromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.tar.gz
chromium_src-3e1d8c8ffc624ab225032eeb0e7c0893cafe96f2.tar.bz2
Add APK targets for sql_unittests and sync_unit_tests.
BUG=125059 Follow-up to: http://codereview.chromium.org/10399126/ TEST= Review URL: https://chromiumcodereview.appspot.com/10443068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/sync.gyp29
1 files changed, 28 insertions, 1 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 80eff93..fcbd96a 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -692,7 +692,7 @@
# The unit test executable for sync tests.
{
'target_name': 'sync_unit_tests',
- 'type': 'executable',
+ 'type': '<(gtest_target_type)',
'dependencies': [
'../base/base.gyp:run_all_unittests',
'sync_tests',
@@ -716,6 +716,11 @@
'../chrome/chrome.gyp:browser',
],
}],
+ ['OS == "android" and gtest_target_type == "shared_library"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
],
},
@@ -736,4 +741,26 @@
],
},
],
+ 'conditions': [
+ # Special target to wrap a gtest_target_type==shared_library
+ # sync_unit_tests into an android apk for execution.
+ ['OS == "android" and gtest_target_type == "shared_library"', {
+ 'targets': [
+ {
+ 'target_name': 'sync_unit_tests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ 'sync_unit_tests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'sync_unit_tests',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
+ 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
+ ],
+ }],
+ ],
}