diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 23:56:24 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 23:56:24 +0000 |
| commit | c7c73a72ee451c7c243ca48d57e7249d6e3a2646 (patch) | |
| tree | 3356d03d057050ce6a80b6785091f97133f89535 | |
| parent | ddf4aa0b1d4cfef560ba4fc1ada3ead761e5f83a (diff) | |
| download | chromium_src-c7c73a72ee451c7c243ca48d57e7249d6e3a2646.zip chromium_src-c7c73a72ee451c7c243ca48d57e7249d6e3a2646.tar.gz chromium_src-c7c73a72ee451c7c243ca48d57e7249d6e3a2646.tar.bz2 | |
ui: Move android test (scroller) into gfx_unittests target.
This test does not seem to need any ResourceBundle initialization and
does not seem to depend on any global state or extra setup, so it should
be fine to move it straightforward into gfx_unittests without any other
modifications.
BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=ben@chromium.org, danakj@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/270773004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269922 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/gfx.gyp | 10 | ||||
| -rw-r--r-- | ui/ui_unittests.gyp | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 6b69cb1..dd0de8a 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -517,6 +517,16 @@ 'interpolated_transform_unittest.cc', ], }], + ['OS == "android"', { + 'sources': [ + 'android/scroller_unittest.cc', + ], + }], + ['OS == "android" and gtest_target_type == "shared_library"', { + 'dependencies': [ + '../../testing/android/native_test.gyp:native_test_native_code', + ], + }], ], } ], diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp index 2cc68b4..4110292 100644 --- a/ui/ui_unittests.gyp +++ b/ui/ui_unittests.gyp @@ -135,11 +135,6 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }], - ['OS == "android"', { - 'sources': [ - 'gfx/android/scroller_unittest.cc', - ], - }], ['OS == "android" and gtest_target_type == "shared_library"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', |