|
[Service Manager] Get rid of dynamic service discovery
Dynamic service discovery introduces complexity and nondeterminism in
the Service Manager, and its implementation was never quite production-
ready.
This CL removes all of that support, instead requiring a static
service catalog configuration to be provided. Support remains for
dynamic manifest discovery via ManifestProvider in order to satisfy
content layering requirements.
The interesting and interdependent high-level changes covered here:
- No more Packages directory; service binaries live in root_out_dir
- Catalog no longer touches disk for any metadata
- service_manifest and catalog target settings have less redundancy
- service_manifest and catalog outputs go in the target_gen_dir now
- service_manifest_overlay behavior has been merged into service_manifest
- Service Manager may be constructed with a static catalog manifest
- BackgroundServiceManager no longer owns EDK init/shutdown
- SM::StartEmbedderService -> SM::RegisterService, more generic API
- The "service overrides" concept is no longer useful and thus removed
- All SM embedders, including test suites, are now configured with
their own static catalog manifest at runtime.
BUG= 677194, 672614
TEST=standalone mash_session works, chrome --mash works, mash_browser_tests, various mus and SM-related unit tests all operating normally
TBR=sky@chromium.org
TBR=xhwang@chromium.org
Review-Url: https://codereview.chromium.org/2645973006
Cr-Original-Commit-Position: refs/heads/master@{#445678}
Committed: https://chromium.googlesource.com/chromium/src/+/f5a497cd5ce83519a9c71bd1ef877f85ec022d38
Review-Url: https://codereview.chromium.org/2645973006
Cr-Commit-Position: refs/heads/master@{#445870}
Committed: https://chromium.googlesource.com/chromium/src/+/0a386b5d98de38051e36d314fc43a8a81f913353
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+1670 lines, -1881 lines) |
Patch |
 |
M |
ash/autoclick/mus/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
ash/mus/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+2 lines, -6 lines |
0 comments
|
Download
|
 |
M |
ash/touch_hud/mus/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/app/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
3 chunks |
+48 lines, -45 lines |
0 comments
|
Download
|
 |
M |
chrome/app/mash/BUILD.gn
|
View
|
|
4 chunks |
+20 lines, -16 lines |
0 comments
|
Download
|
 |
M |
chrome/app/mash/DEPS
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/app/mash/mash_runner.cc
|
View
|
1
2
3
4
5
|
5 chunks |
+36 lines, -46 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
|
2 chunks |
+1 line, -4 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/browser_resources.grd
|
View
|
1
2
3
4
5
6
|
1 chunk |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/test/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
4 chunks |
+22 lines, -16 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mash_browser_tests_main.cc
|
View
|
1
2
3
4
5
|
7 chunks |
+30 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mojo_test_connector.h
|
View
|
|
3 chunks |
+13 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mojo_test_connector.cc
|
View
|
1
2
3
|
6 chunks |
+78 lines, -126 lines |
0 comments
|
Download
|
 |
M |
chromecast/browser/BUILD.gn
|
View
|
1
2
3
4
5
6
|
1 chunk |
+3 lines, -10 lines |
0 comments
|
Download
|
 |
M |
components/filesystem/BUILD.gn
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+21 lines, -2 lines |
0 comments
|
Download
|
 |
M |
components/filesystem/DEPS
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
A |
components/filesystem/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
components/font_service/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
components/leveldb/BUILD.gn
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+24 lines, -2 lines |
0 comments
|
Download
|
 |
M |
components/leveldb/DEPS
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
A |
components/leveldb/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
components/nacl/loader/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
content/BUILD.gn
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
content/browser/service_manager/service_manager_context.cc
|
View
|
|
1 chunk |
+8 lines, -8 lines |
0 comments
|
Download
|
 |
M |
content/content_resources.grd
|
View
|
|
1 chunk |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
content/public/app/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
content/test/BUILD.gn
|
View
|
1
2
3
4
5
6
|
5 chunks |
+17 lines, -3 lines |
0 comments
|
Download
|
 |
M |
content/test/DEPS
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/test/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
8
9
10
|
1 chunk |
+19 lines, -0 lines |
0 comments
|
Download
|
 |
M |
mash/BUILD.gn
|
View
|
|
4 chunks |
+43 lines, -43 lines |
0 comments
|
Download
|
 |
M |
mash/example/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
mash/quick_launch/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
|
1 chunk |
+1 line, -3 lines |
0 comments
|
Download
|
 |
M |
mash/runner/BUILD.gn
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
A |
mash/runner/DEPS
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
mash/runner/main.cc
|
View
|
1
2
3
4
5
|
2 chunks |
+23 lines, -19 lines |
0 comments
|
Download
|
 |
M |
mash/test/DEPS
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
mash/test/mash_unittests.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+25 lines, -1 line |
0 comments
|
Download
|
 |
M |
media/mojo/services/BUILD.gn
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+22 lines, -2 lines |
0 comments
|
Download
|
 |
A |
media/mojo/services/DEPS
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A |
media/mojo/services/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/catalog/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
services/catalog/catalog.h
|
View
|
|
5 chunks |
+18 lines, -45 lines |
0 comments
|
Download
|
 |
M |
services/catalog/catalog.cc
|
View
|
1
2
3
4
5
|
6 chunks |
+116 lines, -96 lines |
0 comments
|
Download
|
 |
M |
services/catalog/entry.h
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/catalog/entry.cc
|
View
|
|
3 chunks |
+21 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/catalog/instance.h
|
View
|
|
2 chunks |
+9 lines, -14 lines |
0 comments
|
Download
|
 |
M |
services/catalog/instance.cc
|
View
|
|
3 chunks |
+28 lines, -19 lines |
0 comments
|
Download
|
 |
M |
services/catalog/public/tools/catalog.gni
|
View
|
|
5 chunks |
+68 lines, -22 lines |
0 comments
|
Download
|
 |
M |
services/catalog/public/tools/generate_manifest.py
|
View
|
|
4 chunks |
+30 lines, -8 lines |
0 comments
|
Download
|
 |
D |
services/catalog/reader.h
|
View
|
|
1 chunk |
+0 lines, -88 lines |
0 comments
|
Download
|
 |
D |
services/catalog/reader.cc
|
View
|
|
1 chunk |
+0 lines, -356 lines |
0 comments
|
Download
|
 |
M |
services/device/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/file/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/image_decoder/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/background_service_manager.h
|
View
|
|
1 chunk |
+36 lines, -37 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/background_service_manager.cc
|
View
|
|
2 chunks |
+50 lines, -139 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/tests/BUILD.gn
|
View
|
|
3 chunks |
+7 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/service_manager/background/tests/background_service_manager_unittest.cc
|
View
|
|
1 chunk |
+7 lines, -5 lines |
0 comments
|
Download
|
 |
D |
services/service_manager/public/constants.gni
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/BUILD.gn
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/lib/service_test.cc
|
View
|
|
3 chunks |
+14 lines, -9 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/service.gni
|
View
|
|
3 chunks |
+14 lines, -54 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/service_test.h
|
View
|
|
3 chunks |
+10 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/standalone_service/main.cc
|
View
|
|
3 chunks |
+1 line, -44 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/service_manifest.gni
|
View
|
1
2
3
|
2 chunks |
+87 lines, -187 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/tools/manifest/manifest_collator.py
|
View
|
|
3 chunks |
+28 lines, -8 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/runner/host/service_process_launcher.cc
|
View
|
|
1 chunk |
+0 lines, -18 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/runner/host/service_process_launcher_unittest.cc
|
View
|
|
5 chunks |
+5 lines, -19 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/service_manager.h
|
View
|
|
3 chunks |
+9 lines, -10 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/service_manager.cc
|
View
|
|
10 chunks |
+26 lines, -29 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/standalone/context.h
|
View
|
|
2 chunks |
+5 lines, -32 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/standalone/context.cc
|
View
|
|
6 chunks |
+15 lines, -126 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/BUILD.gn
|
View
|
|
4 chunks |
+31 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/connect/BUILD.gn
|
View
|
|
3 chunks |
+14 lines, -5 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/lifecycle/BUILD.gn
|
View
|
|
3 chunks |
+13 lines, -5 lines |
0 comments
|
Download
|
 |
A |
services/service_manager/tests/run_all_unittests.cc
|
View
|
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/service_manager/BUILD.gn
|
View
|
|
3 chunks |
+8 lines, -6 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/shutdown/BUILD.gn
|
View
|
|
2 chunks |
+10 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/tracing/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/ui/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
3 chunks |
+3 lines, -42 lines |
0 comments
|
Download
|
 |
M |
services/ui/clipboard/BUILD.gn
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+21 lines, -2 lines |
0 comments
|
Download
|
 |
A |
services/ui/clipboard/DEPS
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/ui/clipboard/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/demo/BUILD.gn
|
View
|
1
2
3
4
|
3 chunks |
+25 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/ui/demo/DEPS
|
View
|
1
2
3
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/ui/demo/run_all_unittests.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/ime/BUILD.gn
|
View
|
1
2
3
4
5
6
7
|
3 chunks |
+24 lines, -2 lines |
0 comments
|
Download
|
 |
A |
services/ui/ime/DEPS
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/ui/ime/run_all_unittests.cc
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/ui/ime/test_ime_driver/BUILD.gn
|
View
|
1
2
3
4
5
6
7
8
9
10
11
12
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/BUILD.gn
|
View
|
1
2
3
4
5
6
|
5 chunks |
+21 lines, -2 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/DEPS
|
View
|
1
2
3
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/ui/ws/run_all_unittests.cc
|
View
|
1
2
3
4
5
|
1 chunk |
+39 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ui/views/mus/BUILD.gn
|
View
|
|
8 chunks |
+30 lines, -4 lines |
0 comments
|
Download
|
 |
M |
ui/views/mus/DEPS
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
ui/views/mus/interactive_ui_tests_mus.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ui/views/mus/run_all_unittests_mus.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ui/views/mus/views_mus_test_suite.cc
|
View
|
1
2
3
4
5
|
5 chunks |
+27 lines, -4 lines |
0 comments
|
Download
|
Dependent Patchsets:
Total messages: 80 (67 generated)
|