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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/events/events.gyp | 7 | ||||
| -rw-r--r-- | ui/gfx/gfx.gyp | 5 | ||||
| -rw-r--r-- | ui/ui_unittests.gyp | 7 |
3 files changed, 5 insertions, 14 deletions
diff --git a/ui/events/events.gyp b/ui/events/events.gyp index 8383356..f3beac5 100644 --- a/ui/events/events.gyp +++ b/ui/events/events.gyp @@ -321,7 +321,7 @@ 'event_unittest.cc', ], }], - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../../testing/android/native_test.gyp:native_test_native_code', ], @@ -330,10 +330,7 @@ }, ], 'conditions': [ - # Special target to wrap a gtest_target_type==shared_library - # ui_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"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'events_unittests_apk', diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 9f909f9..2e45f8b 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -548,10 +548,7 @@ }, ], }], - # Special target to wrap a gtest_target_type==shared_library - # gfx_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"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'gfx_unittests_apk', diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index f2ea062..28e76ae 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -135,7 +135,7 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }], - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], @@ -254,10 +254,7 @@ }, ], }], - # Special target to wrap a gtest_target_type==shared_library - # ui_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"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'ui_unittests_apk', |