mojo/shell/BUILD.gn - Issue 782013002: Android: decouple mojo shell from the network service.

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/shell/BUILD.gn

Issue 782013002: Android: decouple mojo shell from the network service. (Closed) Base URL: https://github.com/domokit/mojo.git@build-rule-for-the-network-service

Patch Set: Created 6 years ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/AndroidHandler.java » ('j') | mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/shell/BUILD.gn

diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn

index d9f797c806268dfa814ae1f12f76a5e13dc2900e..65528cfd196c8adfe4e9d2467ae0f3a578e15264 100644

--- a/mojo/shell/BUILD.gn

+++ b/mojo/shell/BUILD.gn

@@ -154,8 +154,6 @@ source_set("lib") {

"android/android_handler.cc",

"android/android_handler_loader.h",

"android/android_handler_loader.cc",

- "network_application_loader.cc",

- "network_application_loader.h",

]

deps += [

@@ -228,7 +226,6 @@ if (is_android) {

deps = [

"//base:base_java",

- "//net/android:net_java",

]

}

@@ -247,7 +244,6 @@ if (is_android) {

":jni_headers",

":lib",

"//mojo/application_manager",

- "//net",

"//services/native_viewport:lib",

"//ui/gl",

]

@@ -260,6 +256,7 @@ if (is_android) {

dest = mojo_shell_assets_dir

sources = [

"$root_out_dir/lib.stripped/libbootstrap.so",

+ "$root_out_dir/obj/mojo/services/network/network_service.mojo",

"$root_out_dir/obj/mojo/shell/bootstrap_java.dex.jar",

]

}