Remove all service manifests from data_deps

Manifest outputs are never needed at runtime, so these entries in data_deps are inaccurate. They also break stuff now on some (non-tree-closing) builders. This removes all references to service manifest rules in data_deps. BUG=684406 TBR=ben@chromium.org Review-Url: https://codereview.chromium.org/2652273002 Cr-Commit-Position: refs/heads/master@{#446052}
cbchan · Jan 25, 2017 · ccb9053 · ccb9053
1 parent 6e547f0
commit ccb9053
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 106 deletions.
diff --git a/components/filesystem/BUILD.gn b/components/filesystem/BUILD.gn
@@ -53,10 +53,6 @@ service("filesystem") {
     "//services/service_manager/public/cpp",
     "//services/tracing/public/cpp",
   ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/components/leveldb/BUILD.gn b/components/leveldb/BUILD.gn
@@ -50,10 +50,6 @@ service("leveldb") {
     "//services/service_manager/public/cpp",
     "//services/tracing/public/cpp",
   ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/components/nacl/broker/BUILD.gn b/components/nacl/broker/BUILD.gn
@@ -38,10 +38,6 @@ source_set("broker") {
   } else {
     deps += [ ":content_dummy" ]
   }
-
-  data_deps = [
-    ":nacl_broker_manifest",
-  ]
 }
 
 # This exists just to make 'gn check' happy with :broker.  It can't depend

diff --git a/mash/browser/BUILD.gn b/mash/browser/BUILD.gn
@@ -56,7 +56,6 @@ service("browser") {
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
 
   data_deps = [
-    ":manifest",
     "//services/ui",
   ]
 }

diff --git a/mash/catalog_viewer/BUILD.gn b/mash/catalog_viewer/BUILD.gn
@@ -48,10 +48,6 @@ service("catalog_viewer") {
   ]
 
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn
@@ -33,10 +33,6 @@ service("views_examples") {
   ]
 
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn
@@ -37,7 +37,6 @@ service("window_type_launcher") {
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
 
   data_deps = [
-    ":manifest",
     "//services/ui",
   ]
 }

diff --git a/mash/session/BUILD.gn b/mash/session/BUILD.gn
@@ -49,10 +49,6 @@ service("session") {
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:sources",
   ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/mash/simple_wm/BUILD.gn b/mash/simple_wm/BUILD.gn
@@ -55,7 +55,6 @@ source_set("lib") {
   ]
 
   data_deps = [
-    ":manifest",
     "//services/ui",
   ]
 }

diff --git a/mash/task_viewer/BUILD.gn b/mash/task_viewer/BUILD.gn
@@ -43,10 +43,6 @@ service("task_viewer") {
   ]
 
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/mash/webtest/BUILD.gn b/mash/webtest/BUILD.gn
@@ -50,10 +50,6 @@ service("webtest") {
   ]
 
   resources = [ "$root_out_dir/views_mus_resources.pak" ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
@@ -153,10 +153,6 @@ service("media") {
     "//mojo/public/c/system",
     "//services/service_manager/public/cpp",
   ]
-
-  data_deps = [
-    ":media_manifest",
-  ]
 }
 
 # crbug.com/676055: media_service_unittests currently fails to link in Windows
@@ -210,7 +206,6 @@ test("media_pipeline_integration_unittests") {
 
   data_deps = [
     ":media",
-    ":pipeline_test_manifest",
   ]
 }
 

diff --git a/services/service_manager/README.md b/services/service_manager/README.md
@@ -130,7 +130,6 @@ Consider this simple application that implements the Service interface:
     service("my_service") {
       sources = [ "my_service.cc" ]
       deps = [ "//base", "//services/service_manager/public/cpp" ]
-      data_deps = [ ":manifest" ]
     }
 
     service_manifest("manifest") {

diff --git a/services/service_manager/background/tests/BUILD.gn b/services/service_manager/background/tests/BUILD.gn
@@ -25,7 +25,6 @@ source_set("unittests") {
 
   data_deps = [
     ":background_service_manager_test_service",
-    ":test_manifest",
   ]
 }
 
@@ -46,10 +45,6 @@ service("background_service_manager_test_service") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-
-  data_deps = [
-    ":test_service_manifest",
-  ]
 }
 
 service_manifest("test_manifest") {

diff --git a/services/service_manager/runner/host/BUILD.gn b/services/service_manager/runner/host/BUILD.gn
@@ -64,10 +64,6 @@ service("host_test_service") {
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp/standalone_service:main",
   ]
-
-  data_deps = [
-    ":host_test_service_manifest",
-  ]
 }
 
 service_manifest("host_test_service_manifest") {

diff --git a/services/service_manager/tests/connect/BUILD.gn b/services/service_manager/tests/connect/BUILD.gn
@@ -29,7 +29,6 @@ source_set("connect") {
     ":connect_test_singleton_app",
     ":connect_test_exe",
     ":connect_test_package",
-    ":manifest",
   ]
 }
 
@@ -69,9 +68,6 @@ service("connect_test_package") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":connect_test_package_manifest",
-  ]
 }
 
 service_manifest("connect_test_package_manifest") {
@@ -95,9 +91,6 @@ service("connect_test_app") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":connect_test_app_manifest",
-  ]
 }
 
 service_manifest("connect_test_app_manifest") {
@@ -117,9 +110,6 @@ service("connect_test_class_app") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":connect_test_class_app_manifest",
-  ]
 }
 
 service_manifest("connect_test_class_app_manifest") {
@@ -137,9 +127,6 @@ service("connect_test_singleton_app") {
     "//mojo/common:common_base",
     "//services/service_manager/public/cpp:sources",
   ]
-  data_deps = [
-    ":connect_test_singleton_app_manifest",
-  ]
 }
 
 service_manifest("connect_test_singleton_app_manifest") {
@@ -161,10 +148,6 @@ executable("connect_test_exe") {
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp/standalone_service:main",
   ]
-
-  data_deps = [
-    ":connect_test_exe_manifest",
-  ]
 }
 
 service_manifest("connect_test_exe_manifest") {

diff --git a/services/service_manager/tests/lifecycle/BUILD.gn b/services/service_manager/tests/lifecycle/BUILD.gn
@@ -29,7 +29,6 @@ source_set("lifecycle") {
     ":lifecycle_unittest_parent",
     ":lifecycle_unittest_exe",
     ":lifecycle_unittest_package",
-    ":manifest",
   ]
 }
 
@@ -79,9 +78,6 @@ service("lifecycle_unittest_package") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":lifecycle_unittest_package_manifest",
-  ]
 }
 
 service_manifest("lifecycle_unittest_package_manifest") {
@@ -104,10 +100,6 @@ service("lifecycle_unittest_app") {
     "//base",
     "//services/service_manager/public/cpp:sources",
   ]
-
-  data_deps = [
-    ":lifecycle_unittest_app_manifest",
-  ]
 }
 
 service_manifest("lifecycle_unittest_app_manifest") {
@@ -125,10 +117,6 @@ service("lifecycle_unittest_parent") {
     "//base",
     "//services/service_manager/public/cpp:sources",
   ]
-
-  data_deps = [
-    ":lifecycle_unittest_parent_manifest",
-  ]
 }
 
 service_manifest("lifecycle_unittest_parent_manifest") {
@@ -148,10 +136,6 @@ executable("lifecycle_unittest_exe") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/cpp/standalone_service:main",
   ]
-
-  data_deps = [
-    ":lifecycle_unittest_exe_manifest",
-  ]
 }
 
 service_manifest("lifecycle_unittest_exe_manifest") {

diff --git a/services/service_manager/tests/service_manager/BUILD.gn b/services/service_manager/tests/service_manager/BUILD.gn
@@ -27,7 +27,6 @@ source_set("service_manager") {
   ]
 
   data_deps = [
-    ":manifest",
     ":service_manager_unittest_embedder",
     ":service_manager_unittest_target",
   ]
@@ -62,10 +61,6 @@ executable("service_manager_unittest_target") {
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp/standalone_service:main",
   ]
-
-  data_deps = [
-    ":target_manifest",
-  ]
 }
 
 service_manifest("target_manifest") {

diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
@@ -33,10 +33,6 @@ source_set("lib") {
     "//services/service_manager/public/cpp",
     "//services/shape_detection/public/interfaces",
   ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {

diff --git a/services/ui/demo/BUILD.gn b/services/ui/demo/BUILD.gn
@@ -43,7 +43,6 @@ service("mus_demo") {
   ]
 
   data_deps = [
-    ":manifest",
     "//services/ui",
   ]
 }

diff --git a/services/ui/gpu/BUILD.gn b/services/ui/gpu/BUILD.gn
@@ -57,10 +57,6 @@ test("mus_gpu_unittests") {
     "//ui/gfx:memory_buffer",
     "//ui/gfx/geometry",
   ]
-
-  data_deps = [
-    ":mus_gpu_unittests_app_manifest",
-  ]
 }
 
 service_manifest("mus_gpu_unittests_app_manifest") {

diff --git a/services/ui/test_wm/BUILD.gn b/services/ui/test_wm/BUILD.gn
@@ -25,7 +25,6 @@ service("test_wm") {
   ]
 
   data_deps = [
-    ":manifest",
     "//services/ui",
   ]
 }

diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn
@@ -17,10 +17,6 @@ service("video_capture") {
     ":lib",
     "//mojo/public/cpp/system",
   ]
-
-  data_deps = [
-    ":manifest",
-  ]
 }
 
 service_manifest("manifest") {
@@ -82,10 +78,6 @@ test("video_capture_unittests") {
     "//testing/gtest",
     "//ui/gfx:test_support",
   ]
-
-  data_deps = [
-    ":unittest_manifest",
-  ]
 }
 
 service_manifest("unittest_manifest") {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ source_set("lib") { @@
       ]
       data_deps = [
-        ":manifest",
         "//services/ui",
       ]
     }
@@ Expand Down @@