diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:09:58 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:09:58 +0000 |
| commit | 87a80855771139a4140dd6686b7611290fb7937d (patch) | |
| tree | 258f3bb812d92677f5fceb6b5e67c0e3fbfd0fcf /sync | |
| parent | 93748d64955b60c0c75ababddb8be26823452cb7 (diff) | |
| download | chromium_src-87a80855771139a4140dd6686b7611290fb7937d.zip chromium_src-87a80855771139a4140dd6686b7611290fb7937d.tar.gz chromium_src-87a80855771139a4140dd6686b7611290fb7937d.tar.bz2 | |
Android: cleanup gtest_target_type conditions.
For a long time (crrev.com/133053) OS==android implies:
gtest_target_type=shared_library
Cleanup the spurious conditions and obsolete TODOs.
BUG=
Review URL: https://codereview.chromium.org/278443003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/sync_tests.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index b7acb42d..af63ad9 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -439,7 +439,7 @@ 'internal_api/sync_backup_manager_unittest.cc', 'internal_api/sync_core_proxy_impl_unittest.cc', 'internal_api/sync_encryption_handler_impl_unittest.cc', - 'internal_api/sync_manager_impl_unittest.cc', + 'internal_api/sync_manager_impl_unittest.cc', 'internal_api/sync_rollback_manager_base_unittest.cc', 'internal_api/sync_rollback_manager_unittest.cc', 'internal_api/syncapi_server_connection_manager_unittest.cc', @@ -518,7 +518,7 @@ '../base/allocator/allocator.gyp:allocator', ], }], - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], @@ -677,9 +677,7 @@ }, ], }], - # 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"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'sync_unit_tests_apk', |