diff options
| author | tfarina <tfarina@chromium.org> | 2014-08-29 10:02:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 17:04:07 +0000 |
| commit | 6297a2f1e441c46d6f8ca37a3798fe6fbdd6cc4c (patch) | |
| tree | ab2d3940eb6e1e9cf247bcce1d038a77bdac68da /build/android | |
| parent | bc48a481990a51564c4f0208b09627a00b2523eb (diff) | |
| download | chromium_src-6297a2f1e441c46d6f8ca37a3798fe6fbdd6cc4c.zip chromium_src-6297a2f1e441c46d6f8ca37a3798fe6fbdd6cc4c.tar.gz chromium_src-6297a2f1e441c46d6f8ca37a3798fe6fbdd6cc4c.tar.bz2 | |
Revert of ui: Move ui_unittests.gyp into ui/base. (patchset #5 id:80001 of https://codereview.chromium.org/506483002/)
Reason for revert:
it breaks clobber build of ios_dbg_simulator.
Original issue's description:
> ui: Move ui_unittests.gyp into ui/base.
>
> ui_unittests.gyp -> ui_base_tests.gyp (follow gfx_tests.gyp pattern).
> ui_unittests_bundle.gypi -> ui/base/ui_base_tests_bundle.gypi
> ui_unittests.isolate -> ui_base_tests.isolate
>
> Add a TODO assigned to me to rename ui_unittests target to
> ui_base_unittests when buildbot is updated.
>
> BUG=331829,373148,299841,103304
> TEST=ui_unittests
> R=sky@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/60f6892f7223f9d6db92314edb5df9b63d25720f
TBR=sky@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=331829,373148,299841,103304
Review URL: https://codereview.chromium.org/522843002
Cr-Commit-Position: refs/heads/master@{#292657}
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/gtest/setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py index e6bfb80..00a5753 100644 --- a/build/android/pylib/gtest/setup.py +++ b/build/android/pylib/gtest/setup.py @@ -40,7 +40,7 @@ _ISOLATE_FILE_PATHS = { 'media_unittests': 'media/media_unittests.isolate', 'net_unittests': 'net/net_unittests.isolate', 'sql_unittests': 'sql/sql_unittests.isolate', - 'ui_unittests': 'ui/base/ui_base_tests.isolate', + 'ui_unittests': 'ui/ui_unittests.isolate', 'unit_tests': 'chrome/unit_tests.isolate', 'webkit_unit_tests': 'third_party/WebKit/Source/web/WebKitUnitTests.isolate', |