Move the network service source-of-truth from Mojo to Chromium.
This patch changes the roll scripts so that:
- mojo/services/network is now pulled from Chromium into Mojo
- mojo/services/network/public is *not* pulled from Mojo into Chromium
anymore
A corresponding Chromium change[1] updates mojo/services/network to ToT
Mojo.
[1] https://codereview.chromium.org/858093002/
BUG=450356
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/832683005
diff --git a/mojo/tools/roll/rev_sdk.py b/mojo/tools/roll/rev_sdk.py
index de9a871..02b4bed 100755
--- a/mojo/tools/roll/rev_sdk.py
+++ b/mojo/tools/roll/rev_sdk.py
@@ -21,7 +21,6 @@
"mojo/services/input_events/public",
"mojo/services/native_viewport/public",
"mojo/services/navigation/public",
- "mojo/services/network/public",
"mojo/services/surfaces/public",
"mojo/services/view_manager/public",
"mojo/services/window_manager/public",
diff --git a/mojo/tools/roll/update_from_chromium.py b/mojo/tools/roll/update_from_chromium.py
index f28caed..5d2bd44 100755
--- a/mojo/tools/roll/update_from_chromium.py
+++ b/mojo/tools/roll/update_from_chromium.py
@@ -80,8 +80,10 @@
# These directories are temporarily cloned in order to support the network
# bootstrap library until we get that sorted out.
-net_dirs = ["crypto",
- "net"]
+net_dirs = [
+ "crypto",
+ "net",
+ "mojo/services/network"]
files_to_copy = ["sandbox/sandbox_export.h",
".clang-format"]
