Remove no longer needed skip_deps_check option for mojom targets

This change removes the skip_deps_check option since mojom target
dependency check now allows transitive dependencies.

Change-Id: I40e1a5f024bdb8456fe44e7e419a6ef9cb23e057
Reviewed-on: https://chromium-review.googlesource.com/c/1291993
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602445}

content/common/BUILD.gn

@@ -490,11 +490,6 @@ mojom("mojo_bindings") {
   # at some point.
   cpp_only = true
 
-  # imports vs deps check is disabled for this target to work around
-  # windows multiple definitions linker error caused by having
-  # both a direct and an indirect dependency on the same target
-  skip_deps_check = true
-
   disable_variants = true
 
   sources = [

content/public/common/BUILD.gn

@@ -339,11 +339,6 @@ mojom("interfaces") {
     "//extensions/common:mojo_blink",
   ]
 
-  # imports vs deps check is disabled for this target to work around
-  # windows multiple definitions linker error caused by having
-  # both a direct and an indirect dependency on the same target
-  skip_deps_check = true
-
   sources = [
     "appcache_info.mojom",
     "fullscreen_video_element.mojom",

mojo/public/tools/bindings/mojom.gni

@@ -441,41 +441,39 @@ template("mojom") {
 
   if (defined(invoker.sources)) {
     verify_deps_target_names = []
-    if (!defined(invoker.skip_deps_check) || !invoker.skip_deps_check) {
-      verify_deps_target_name = "${target_name}__verify_deps"
-      verify_deps_target_names += [ ":$verify_deps_target_name" ]
-      mojom_target_name = target_name
+    verify_deps_target_name = "${target_name}__verify_deps"
+    verify_deps_target_names += [ ":$verify_deps_target_name" ]
+    mojom_target_name = target_name
 
-      action(verify_deps_target_name) {
-        script = mojom_generator_script
-        inputs = mojom_generator_sources + jinja2_sources
-        sources = invoker.sources
-        deps = [
-          ":$parsed_target_name",
-        ]
-        outputs = []
-        filelist = []
-        foreach(source, invoker.sources) {
-          filename = get_path_info("$source", "name")
-          dirname = get_path_info("$source", "gen_dir")
-          outputs += [ "$dirname/$filename.v" ]
-          filelist += [ rebase_path("$source", root_build_dir) ]
-        }
+    action(verify_deps_target_name) {
+      script = mojom_generator_script
+      inputs = mojom_generator_sources + jinja2_sources
+      sources = invoker.sources
+      deps = [
+        ":$parsed_target_name",
+      ]
+      outputs = []
+      filelist = []
+      foreach(source, invoker.sources) {
+        filename = get_path_info("$source", "name")
+        dirname = get_path_info("$source", "gen_dir")
+        outputs += [ "$dirname/$filename.v" ]
+        filelist += [ rebase_path("$source", root_build_dir) ]
+      }
 
-        response_file_contents = filelist
+      response_file_contents = filelist
 
-        args = [
-          "verify",
-          "--filelist={{response_file_name}}",
-          "-f",
-          rebase_path("$target_gen_dir/$mojom_target_name.deps_sources_list",
-                      root_build_dir),
-          "--gen_dir",
-          rebase_path(root_gen_dir, root_build_dir),
-          "--depth",
-          rebase_path("//", root_build_dir),
-        ]
-      }
+      args = [
+        "verify",
+        "--filelist={{response_file_name}}",
+        "-f",
+        rebase_path("$target_gen_dir/$mojom_target_name.deps_sources_list",
+                    root_build_dir),
+        "--gen_dir",
+        rebase_path(root_gen_dir, root_build_dir),
+        "--depth",
+        rebase_path("//", root_build_dir),
+      ]
     }
   }