|
Revert of [Service Manager] Get rid of dynamic service discovery (patchset #10 id:180001 of https://codereview.chromium.org/2645973006/ )
Reason for revert:
Seems to have broken content_unittests on both
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/39329
and
https://build.chromium.org/p/chromium.android/builders/Lollipop%20Phone%20Tester/builds/9385
with the following error:
CommandFailedError: Failed to list tests on any device
caused by a crash when listing tests:
[FATAL:catalog.cc(167)] Check failed: result.
Original issue's description:
> [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-Commit-Position: refs/heads/master@{#445678}
> Committed: https://chromium.googlesource.com/chromium/src/+/f5a497cd5ce83519a9c71bd1ef877f85ec022d38
TBR=ben@chromium.org,rockot@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 677194, 672614
Review-Url: https://codereview.chromium.org/2651953002
Cr-Commit-Position: refs/heads/master@{#445707}
Committed: https://chromium.googlesource.com/chromium/src/+/415bd5606cf989923a835e5977c645313d65cc45
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+1858 lines, -1688 lines) |
Patch |
 |
M |
ash/mus/BUILD.gn
|
View
|
|
1 chunk |
+5 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/app/BUILD.gn
|
View
|
|
4 chunks |
+46 lines, -49 lines |
0 comments
|
Download
|
 |
M |
chrome/app/mash/BUILD.gn
|
View
|
|
4 chunks |
+16 lines, -20 lines |
0 comments
|
Download
|
 |
M |
chrome/app/mash/DEPS
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/app/mash/mash_runner.cc
|
View
|
|
6 chunks |
+46 lines, -36 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/BUILD.gn
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/browser_resources.grd
|
View
|
|
1 chunk |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
chrome/test/BUILD.gn
|
View
|
|
4 chunks |
+16 lines, -23 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mash_browser_tests_main.cc
|
View
|
|
7 chunks |
+3 lines, -30 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mojo_test_connector.h
|
View
|
|
3 chunks |
+3 lines, -13 lines |
0 comments
|
Download
|
 |
M |
chrome/test/base/mojo_test_connector.cc
|
View
|
|
6 chunks |
+134 lines, -86 lines |
0 comments
|
Download
|
 |
M |
chromecast/browser/BUILD.gn
|
View
|
|
1 chunk |
+10 lines, -3 lines |
0 comments
|
Download
|
 |
M |
components/filesystem/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -21 lines |
0 comments
|
Download
|
 |
M |
components/filesystem/DEPS
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
D |
components/filesystem/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
components/leveldb/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -24 lines |
0 comments
|
Download
|
 |
M |
components/leveldb/DEPS
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
D |
components/leveldb/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
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 |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/test/BUILD.gn
|
View
|
|
5 chunks |
+3 lines, -17 lines |
0 comments
|
Download
|
 |
M |
content/test/DEPS
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
content/test/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -13 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 |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
mash/quick_launch/BUILD.gn
|
View
|
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
 |
M |
mash/runner/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
D |
mash/runner/DEPS
|
View
|
|
1 chunk |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
M |
mash/runner/main.cc
|
View
|
|
3 chunks |
+19 lines, -23 lines |
0 comments
|
Download
|
 |
M |
mash/test/DEPS
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
mash/test/mash_unittests.cc
|
View
|
|
1 chunk |
+1 line, -25 lines |
0 comments
|
Download
|
 |
M |
media/mojo/services/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -22 lines |
0 comments
|
Download
|
 |
D |
media/mojo/services/DEPS
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
D |
media/mojo/services/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
services/catalog/BUILD.gn
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/catalog/catalog.h
|
View
|
|
5 chunks |
+45 lines, -18 lines |
0 comments
|
Download
|
 |
M |
services/catalog/catalog.cc
|
View
|
|
6 chunks |
+95 lines, -115 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 |
+2 lines, -21 lines |
0 comments
|
Download
|
 |
M |
services/catalog/instance.h
|
View
|
|
2 chunks |
+14 lines, -9 lines |
0 comments
|
Download
|
 |
M |
services/catalog/instance.cc
|
View
|
|
3 chunks |
+19 lines, -28 lines |
0 comments
|
Download
|
 |
M |
services/catalog/public/tools/catalog.gni
|
View
|
|
5 chunks |
+22 lines, -68 lines |
0 comments
|
Download
|
 |
M |
services/catalog/public/tools/generate_manifest.py
|
View
|
|
4 chunks |
+8 lines, -30 lines |
0 comments
|
Download
|
 |
A |
services/catalog/reader.h
|
View
|
|
1 chunk |
+88 lines, -0 lines |
0 comments
|
Download
|
 |
A |
services/catalog/reader.cc
|
View
|
|
1 chunk |
+356 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/background_service_manager.h
|
View
|
|
1 chunk |
+36 lines, -35 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/background_service_manager.cc
|
View
|
|
2 chunks |
+139 lines, -50 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/tests/BUILD.gn
|
View
|
|
3 chunks |
+1 line, -7 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/background/tests/background_service_manager_unittest.cc
|
View
|
|
1 chunk |
+5 lines, -7 lines |
0 comments
|
Download
|
 |
A |
services/service_manager/public/constants.gni
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/lib/service_test.cc
|
View
|
|
3 chunks |
+9 lines, -14 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/service.gni
|
View
|
|
4 chunks |
+54 lines, -14 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/service_test.h
|
View
|
|
3 chunks |
+1 line, -10 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/cpp/standalone_service/main.cc
|
View
|
|
3 chunks |
+44 lines, -1 line |
0 comments
|
Download
|
 |
M |
services/service_manager/public/service_manifest.gni
|
View
|
|
2 chunks |
+199 lines, -99 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/public/tools/manifest/manifest_collator.py
|
View
|
|
3 chunks |
+8 lines, -28 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/runner/host/service_process_launcher.cc
|
View
|
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/runner/host/service_process_launcher_unittest.cc
|
View
|
|
4 chunks |
+19 lines, -5 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/service_manager.h
|
View
|
|
3 chunks |
+10 lines, -9 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/service_manager.cc
|
View
|
|
10 chunks |
+33 lines, -30 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/standalone/context.h
|
View
|
|
3 chunks |
+32 lines, -5 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/standalone/context.cc
|
View
|
|
6 chunks |
+126 lines, -15 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/BUILD.gn
|
View
|
|
4 chunks |
+2 lines, -31 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/connect/BUILD.gn
|
View
|
|
3 chunks |
+5 lines, -14 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/lifecycle/BUILD.gn
|
View
|
|
3 chunks |
+5 lines, -13 lines |
0 comments
|
Download
|
 |
D |
services/service_manager/tests/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/service_manager/BUILD.gn
|
View
|
|
3 chunks |
+6 lines, -8 lines |
0 comments
|
Download
|
 |
M |
services/service_manager/tests/shutdown/BUILD.gn
|
View
|
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
services/ui/BUILD.gn
|
View
|
|
2 chunks |
+41 lines, -3 lines |
0 comments
|
Download
|
 |
M |
services/ui/clipboard/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -21 lines |
0 comments
|
Download
|
 |
D |
services/ui/clipboard/DEPS
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
D |
services/ui/clipboard/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
services/ui/demo/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -25 lines |
0 comments
|
Download
|
 |
M |
services/ui/demo/DEPS
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
D |
services/ui/demo/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
services/ui/ime/BUILD.gn
|
View
|
|
3 chunks |
+2 lines, -24 lines |
0 comments
|
Download
|
 |
D |
services/ui/ime/DEPS
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
D |
services/ui/ime/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/BUILD.gn
|
View
|
|
5 chunks |
+2 lines, -21 lines |
0 comments
|
Download
|
 |
M |
services/ui/ws/DEPS
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
D |
services/ui/ws/run_all_unittests.cc
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
ui/views/mus/BUILD.gn
|
View
|
|
8 chunks |
+4 lines, -30 lines |
0 comments
|
Download
|
 |
M |
ui/views/mus/DEPS
|
View
|
|
1 chunk |
+1 line, -2 lines |
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
|
|
5 chunks |
+4 lines, -27 lines |
0 comments
|
Download
|
Total messages: 6 (3 generated)
|