mojo/runner/shell_test_base_android.cc - Issue 1115463002: Fix mojo and mandoline android build breaks.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/runner/shell_test_base_android.cc

Issue 1115463002: Fix mojo and mandoline android build breaks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Exclude mandoline target on android for now; fix GN targets. Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mojo/runner/shell_test_base_android.cc

diff --git a/mojo/runner/shell_test_base_android.cc b/mojo/runner/shell_test_base_android.cc

index 80e84fdb4289a2f9f66f26f23e45b0d56af9355c..83f19ada9285abb8f32ea8117d7b907fe7f8065b 100644

--- a/mojo/runner/shell_test_base_android.cc

+++ b/mojo/runner/shell_test_base_android.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()))));

}

« no previous file with comments | « mojo/runner/BUILD.gn ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »