In practice, for now we only want to ship fixed sets of services bundled directly into the main binary distribution. Rather than scanning disk for manifests, the catalog should support reading a static, aggregate manifest from memory.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/c4146735e6d1dffea9a014e6f89bd6fc57de53d1 commit c4146735e6d1dffea9a014e6f89bd6fc57de53d1 Author: rockot <rockot@chromium.org> Date: Tue Dec 27 23:21:47 2016 Use a static catalog manifest for the standalone Mash runner Does a few interesting things: - Teaches Catalog how to load its data from a static dictionary in memory - Adds GNI for generating catalog manifest JSON - Adds a catalog of common mash services - Deletes mojo_runner - Introduces //mash/runner (executable "mash") which does the same thing mojo_runner did, but has baked-in knowledge of the mash catalog. BUG= 677194 R=ben@chromium.org Review-Url: https://codereview.chromium.org/2573283002 Cr-Commit-Position: refs/heads/master@{#440802} [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/chrome/app/mash/BUILD.gn [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/chrome/app/mash/mash_service_overrides.json [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/content/browser/service_manager/service_manager_context.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/mash/BUILD.gn [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/mash/example/BUILD.gn [add] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/mash/runner/BUILD.gn [add] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/mash/runner/main.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/catalog.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/catalog.h [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/instance.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/instance.h [add] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/public/tools/catalog.gni [add] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/public/tools/generate_manifest.py [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/reader.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/reader.h [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/catalog/store.h [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/background/BUILD.gn [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/background/background_service_manager.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/background/background_service_manager.h [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/public/interfaces/resolver.mojom [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/runner/host/service_process_launcher.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/service_manager.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/service_overrides.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/standalone/BUILD.gn [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/standalone/context.cc [modify] https://crrev.com/c4146735e6d1dffea9a014e6f89bd6fc57de53d1/services/service_manager/standalone/context.h [delete] https://crrev.com/8fd83ce883b96af751b0a2d7919f40b3bbadf1e4/services/service_manager/standalone/desktop/launcher_process.cc [delete] https://crrev.com/8fd83ce883b96af751b0a2d7919f40b3bbadf1e4/services/service_manager/standalone/desktop/launcher_process.h [delete] https://crrev.com/8fd83ce883b96af751b0a2d7919f40b3bbadf1e4/services/service_manager/standalone/desktop/main.cc [delete] https://crrev.com/8fd83ce883b96af751b0a2d7919f40b3bbadf1e4/services/service_manager/standalone/desktop/main_helper.cc [delete] https://crrev.com/8fd83ce883b96af751b0a2d7919f40b3bbadf1e4/services/service_manager/standalone/desktop/main_helper.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/f5a497cd5ce83519a9c71bd1ef877f85ec022d38 commit f5a497cd5ce83519a9c71bd1ef877f85ec022d38 Author: rockot <rockot@chromium.org> Date: Tue Jan 24 08:09:04 2017 [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} [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ash/mus/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/app/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/app/mash/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/app/mash/DEPS [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/app/mash/mash_runner.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/browser/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/browser/browser_resources.grd [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/test/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/test/base/mash_browser_tests_main.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/test/base/mojo_test_connector.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chrome/test/base/mojo_test_connector.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/chromecast/browser/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/filesystem/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/filesystem/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/filesystem/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/leveldb/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/leveldb/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/components/leveldb/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/browser/service_manager/service_manager_context.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/content_resources.grd [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/public/app/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/test/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/test/DEPS [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/content/test/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/example/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/quick_launch/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/runner/BUILD.gn [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/runner/DEPS [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/runner/main.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/test/DEPS [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/mash/test/mash_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/media/mojo/services/BUILD.gn [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/media/mojo/services/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/media/mojo/services/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/catalog.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/catalog.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/entry.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/entry.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/instance.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/instance.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/public/tools/catalog.gni [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/catalog/public/tools/generate_manifest.py [delete] https://crrev.com/00349ff6fdc6751b559d5bf89e35f8af7b62c4cb/services/catalog/reader.cc [delete] https://crrev.com/00349ff6fdc6751b559d5bf89e35f8af7b62c4cb/services/catalog/reader.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/background/background_service_manager.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/background/background_service_manager.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/background/tests/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/background/tests/background_service_manager_unittest.cc [delete] https://crrev.com/00349ff6fdc6751b559d5bf89e35f8af7b62c4cb/services/service_manager/public/constants.gni [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/cpp/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/cpp/lib/service_test.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/cpp/service.gni [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/cpp/service_test.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/cpp/standalone_service/main.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/service_manifest.gni [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/public/tools/manifest/manifest_collator.py [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/runner/host/service_process_launcher.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/runner/host/service_process_launcher_unittest.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/service_manager.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/service_manager.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/standalone/context.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/standalone/context.h [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/connect/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/lifecycle/BUILD.gn [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/service_manager/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/service_manager/tests/shutdown/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/clipboard/BUILD.gn [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/clipboard/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/clipboard/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/demo/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/demo/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/demo/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ime/BUILD.gn [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ime/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ime/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ws/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ws/DEPS [add] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/services/ui/ws/run_all_unittests.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ui/views/mus/BUILD.gn [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ui/views/mus/DEPS [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ui/views/mus/interactive_ui_tests_mus.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ui/views/mus/run_all_unittests_mus.cc [modify] https://crrev.com/f5a497cd5ce83519a9c71bd1ef877f85ec022d38/ui/views/mus/views_mus_test_suite.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/415bd5606cf989923a835e5977c645313d65cc45 commit 415bd5606cf989923a835e5977c645313d65cc45 Author: johnme <johnme@chromium.org> Date: Tue Jan 24 12:07:55 2017 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} [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ash/mus/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/app/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/app/mash/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/app/mash/DEPS [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/app/mash/mash_runner.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/browser/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/browser/browser_resources.grd [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/test/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/test/base/mash_browser_tests_main.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/test/base/mojo_test_connector.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chrome/test/base/mojo_test_connector.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/chromecast/browser/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/components/filesystem/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/components/filesystem/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/components/filesystem/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/components/leveldb/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/components/leveldb/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/components/leveldb/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/browser/service_manager/service_manager_context.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/content_resources.grd [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/public/app/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/test/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/test/DEPS [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/content/test/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/example/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/quick_launch/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/runner/BUILD.gn [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/mash/runner/DEPS [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/runner/main.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/test/DEPS [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/mash/test/mash_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/media/mojo/services/BUILD.gn [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/media/mojo/services/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/media/mojo/services/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/catalog.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/catalog.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/entry.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/entry.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/instance.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/instance.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/public/tools/catalog.gni [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/public/tools/generate_manifest.py [add] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/reader.cc [add] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/catalog/reader.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/background/background_service_manager.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/background/background_service_manager.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/background/tests/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/background/tests/background_service_manager_unittest.cc [add] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/constants.gni [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/cpp/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/cpp/lib/service_test.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/cpp/service.gni [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/cpp/service_test.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/cpp/standalone_service/main.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/service_manifest.gni [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/public/tools/manifest/manifest_collator.py [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/runner/host/service_process_launcher.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/runner/host/service_process_launcher_unittest.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/service_manager.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/service_manager.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/standalone/context.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/standalone/context.h [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/tests/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/tests/connect/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/tests/lifecycle/BUILD.gn [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/service_manager/tests/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/tests/service_manager/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/service_manager/tests/shutdown/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/clipboard/BUILD.gn [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/clipboard/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/clipboard/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/demo/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/demo/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/demo/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/ime/BUILD.gn [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/ime/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/ime/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/ws/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/services/ui/ws/DEPS [delete] https://crrev.com/c7ee9d5e15a8d98d5f5fe2afcff74bec2f3ae7d6/services/ui/ws/run_all_unittests.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ui/views/mus/BUILD.gn [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ui/views/mus/DEPS [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ui/views/mus/interactive_ui_tests_mus.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ui/views/mus/run_all_unittests_mus.cc [modify] https://crrev.com/415bd5606cf989923a835e5977c645313d65cc45/ui/views/mus/views_mus_test_suite.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/0a386b5d98de38051e36d314fc43a8a81f913353 commit 0a386b5d98de38051e36d314fc43a8a81f913353 Author: rockot <rockot@chromium.org> Date: Wed Jan 25 00:14:34 2017 [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} [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ash/autoclick/mus/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ash/mus/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ash/touch_hud/mus/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/app/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/app/mash/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/app/mash/DEPS [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/app/mash/mash_runner.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/browser/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/browser/browser_resources.grd [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/test/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/test/base/mash_browser_tests_main.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/test/base/mojo_test_connector.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chrome/test/base/mojo_test_connector.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/chromecast/browser/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/filesystem/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/filesystem/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/filesystem/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/font_service/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/leveldb/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/leveldb/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/leveldb/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/components/nacl/loader/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/browser/service_manager/service_manager_context.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/content_resources.grd [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/public/app/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/test/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/test/DEPS [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/content/test/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/example/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/quick_launch/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/runner/BUILD.gn [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/runner/DEPS [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/runner/main.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/test/DEPS [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/mash/test/mash_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/media/mojo/services/BUILD.gn [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/media/mojo/services/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/media/mojo/services/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/catalog.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/catalog.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/entry.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/entry.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/instance.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/instance.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/public/tools/catalog.gni [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/catalog/public/tools/generate_manifest.py [delete] https://crrev.com/5f91d1754a7ffa39cff9619db090b91b8d1b4a98/services/catalog/reader.cc [delete] https://crrev.com/5f91d1754a7ffa39cff9619db090b91b8d1b4a98/services/catalog/reader.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/device/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/file/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/image_decoder/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/background/background_service_manager.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/background/background_service_manager.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/background/tests/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/background/tests/background_service_manager_unittest.cc [delete] https://crrev.com/5f91d1754a7ffa39cff9619db090b91b8d1b4a98/services/service_manager/public/constants.gni [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/cpp/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/cpp/lib/service_test.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/cpp/service.gni [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/cpp/service_test.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/cpp/standalone_service/main.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/service_manifest.gni [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/public/tools/manifest/manifest_collator.py [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/runner/host/service_process_launcher.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/runner/host/service_process_launcher_unittest.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/service_manager.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/service_manager.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/standalone/context.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/standalone/context.h [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/connect/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/lifecycle/BUILD.gn [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/service_manager/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/service_manager/tests/shutdown/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/tracing/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/clipboard/BUILD.gn [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/clipboard/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/clipboard/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/demo/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/demo/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/demo/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ime/BUILD.gn [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ime/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ime/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ime/test_ime_driver/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ws/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ws/DEPS [add] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/services/ui/ws/run_all_unittests.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ui/views/mus/BUILD.gn [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ui/views/mus/DEPS [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ui/views/mus/interactive_ui_tests_mus.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ui/views/mus/run_all_unittests_mus.cc [modify] https://crrev.com/0a386b5d98de38051e36d314fc43a8a81f913353/ui/views/mus/views_mus_test_suite.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a60bd4e8eaf30ee4de91922311ed111ff687400e commit a60bd4e8eaf30ee4de91922311ed111ff687400e Author: rockot <rockot@chromium.org> Date: Sat Jan 28 02:11:40 2017 Compile content_unittests service catalog directly into the binary This avoids loading the catalog from disk in startup, eliminating a runtime dependency and allowing us to run service tests here on Android. Also enables the service-consuming local storage tests on Android now that they work. BUG= 677194 TBR=ben@chromium.org Review-Url: https://codereview.chromium.org/2659843005 Cr-Commit-Position: refs/heads/master@{#446885} [modify] https://crrev.com/a60bd4e8eaf30ee4de91922311ed111ff687400e/content/browser/dom_storage/local_storage_context_mojo_unittest.cc [modify] https://crrev.com/a60bd4e8eaf30ee4de91922311ed111ff687400e/content/test/BUILD.gn [modify] https://crrev.com/a60bd4e8eaf30ee4de91922311ed111ff687400e/content/test/run_all_unittests.cc
Comment 1 by roc...@chromium.org
, Dec 27 2016