Commit 887c3015 authored by msw's avatar msw Committed by Commit bot

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}
parent c1fe98e2
......@@ -9,7 +9,7 @@ group("mandoline_all") {
"//mojo:mojo",
]
if (!is_component_build) {
if (!is_android && !is_component_build) {
deps += [ "//mandoline/app:mandoline" ]
}
}
......@@ -17,14 +17,14 @@ group("runner") {
deps = [
":mojo_runner",
":tests",
"//mojo/shell:tests",
":mojo_runner_unittests",
"//mojo/shell:mojo_shell_unittests",
]
if (is_android) {
deps += [
":mojo_runner_apk",
":tests_apk",
":mojo_runner_unittests_apk",
]
}
}
......@@ -332,9 +332,7 @@ mojom("child_process_bindings") {
]
}
test("tests") {
output_name = "mojo_runner_unittests"
test("mojo_runner_unittests") {
sources = [
"child_process_host_unittest.cc",
"data_pipe_peek_unittest.cc",
......
......@@ -38,7 +38,7 @@ void ShellTestBase::SetUpTestApplications() {
Java_ShellTestBase_extractMojoApplications(
env, base::android::GetApplicationContext()));
shell_context_.url_resolver()->SetMojoBaseURL(
FilePathToFileURL(base::FilePath(
mojo::util::FilePathToFileURL(base::FilePath(
base::android::ConvertJavaStringToUTF8(env, service_dir.obj()))));
}
......
......@@ -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",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment