diff options
| author | msw <msw@chromium.org> | 2015-04-28 13:53:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 20:53:47 +0000 |
| commit | 887c30157baaa9242a798ba8a5a4884d9564b11f (patch) | |
| tree | 19c5170d4f02ce1012889d154bc79bb15a75781d /mojo/shell | |
| parent | c1fe98e261ba2dea61a291b3f0b4f9afa2f2ddec (diff) | |
| download | chromium_src-887c30157baaa9242a798ba8a5a4884d9564b11f.zip chromium_src-887c30157baaa9242a798ba8a5a4884d9564b11f.tar.gz chromium_src-887c30157baaa9242a798ba8a5a4884d9564b11f.tar.bz2 | |
Fix mojo and mandoline android build breaks.
Exclude the mandoline target on android for now (no main).
Rename the test targets to avoid naming conflicts...
(android GN targets doesn't seem to respect output_name)
Update the namespace for mojo::util::FilePathToFileURL call.
See initial breakage at http://build.chromium.org/p/chromium.mojo/builders/Chromium%20Mojo%20Android/builds/384
The relevant CLs are:
https://codereview.chromium.org/1109993002
https://codereview.chromium.org/1091513005
BUG=466129
TEST=Building mojo and mandoline for android passes.
R=sky@chromium.org,ben@chromium.org
Review URL: https://codereview.chromium.org/1115463002
Cr-Commit-Position: refs/heads/master@{#327361}
Diffstat (limited to 'mojo/shell')
| -rw-r--r-- | mojo/shell/BUILD.gn | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 3c817ab..71a0858 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -49,9 +49,7 @@ source_set("shell") { ] } -test("tests") { - output_name = "mojo_shell_unittests" - +test("mojo_shell_unittests") { sources = [ "application_manager_unittest.cc", "query_util_unittest.cc", |