🎊 Reland #2 of Have build_config targets depend only on other build_config targets

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 
 assert(is_android)
 
@@ skipping 692 matching lines @@
   #     target.
   #   resource_dirs: List of directories containing resources for this target.
   #   generated_resource_dirs: List of directories containing resources for this
   #     target which are *generated* by a dependency. |generated_resource_files|
   #     must be specified if |generated_resource_dirs| is specified.
   #   generated_resource_files: List of all files in |generated_resource_dirs|.
   #     |generated_resource_dirs| must be specified in |generated_resource_files|
   #     is specified.
   #   android_manifest: AndroidManifest.xml for this target. Defaults to
   #     //build/android/AndroidManifest.xml.
+  #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
   #   custom_package: java package for generated .java files.
   #   v14_skip: If true, don't run v14 resource generator on this. Defaults to
   #     false. (see build/android/gyp/generate_v14_compatible_resources.py)
   #   shared_resources: If true make a resource package that can be loaded by a
   #     different application at runtime to access the package's resources.
   #   app_as_shared_lib: If true make a resource package that can be loaded as
   #     both shared_resources and normal application.
 
   # Example:
   #   android_resources("foo_resources") {
@@ skipping 16 matching lines @@
     zip_path = base_path + ".resources.zip"
     srcjar_path = base_path + ".srcjar"
     r_text_path = base_path + "_R.txt"
     build_config = base_path + ".build_config"
 
     build_config_target_name = "${target_name}__build_config"
     process_resources_target_name = "${target_name}__process_resources"
     final_target_name = target_name
 
     write_build_config(build_config_target_name) {
+      type = "android_resources"
       forward_variables_from(invoker,
                              [
                                "android_manifest",
                                "custom_package",
-                               "deps",
                                "resource_dirs",
                              ])
 
+      if (defined(invoker.deps)) {
+        possible_config_deps = invoker.deps
+      }
+      if (defined(invoker.android_manifest_dep)) {
+        deps = [
+          invoker.android_manifest_dep,
+        ]
+      }
+
       # No package means resources override their deps.
       if (defined(custom_package) || defined(android_manifest)) {
         r_text = r_text_path
       } else {
         assert(defined(invoker.deps),
                "Must specify deps when custom_package is omitted.")
       }
-      visibility = [ ":$process_resources_target_name" ]
 
-      type = "android_resources"
       resources_zip = zip_path
       srcjar = srcjar_path
     }
 
     process_resources(process_resources_target_name) {
-      visibility = [ ":$final_target_name" ]
       forward_variables_from(invoker,
                              [
                                "app_as_shared_lib",
                                "android_manifest",
                                "custom_package",
                                "deps",
                                "generated_resource_dirs",
                                "generated_resource_files",
                                "resource_dirs",
                                "shared_resources",
                                "v14_skip",
                              ])
       if (!defined(deps)) {
         deps = []
       }
       deps += [ ":$build_config_target_name" ]
+      if (defined(invoker.android_manifest_dep)) {
+        deps += [ invoker.android_manifest_dep ]
+      }
 
       # Always generate R.onResourcesLoaded() method, it is required for
       # compiling ResourceRewriter, there is no side effect because the
       # generated R.class isn't used in final apk.
       shared_resources = true
       if (!defined(android_manifest)) {
         android_manifest = "//build/android/AndroidManifest.xml"
       }
     }
 
@@ skipping 43 matching lines @@
   #   renaming_destinations = [ "renamed/asset2.png" ]
   # }
   template("android_assets") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     _build_config = "$target_gen_dir/$target_name.build_config"
     _build_config_target_name = "${target_name}__build_config"
 
     write_build_config(_build_config_target_name) {
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "disable_compression",
-                             ])
       type = "android_assets"
       build_config = _build_config
+
+      forward_variables_from(invoker, [ "disable_compression" ])
+
+      if (defined(invoker.deps)) {
+        possible_config_deps = invoker.deps
+      }
+
       if (defined(invoker.sources)) {
         asset_sources = invoker.sources
       }
       if (defined(invoker.renaming_sources)) {
         assert(defined(invoker.renaming_destinations))
         _source_count = 0
         foreach(_, invoker.renaming_sources) {
           _source_count += 1
         }
         _dest_count = 0
         foreach(_, invoker.renaming_destinations) {
           _dest_count += 1
         }
         assert(
             _source_count == _dest_count,
             "android_assets() renaming_sources.length != renaming_destinations.length")
         asset_renaming_sources = invoker.renaming_sources
         asset_renaming_destinations = invoker.renaming_destinations
       }
     }
 
     group(target_name) {
-      forward_variables_from(invoker, [ "visibility" ])
+      forward_variables_from(invoker,
+                             [
+                               "deps",
+                               "visibility",
+                             ])
       public_deps = [
         ":$_build_config_target_name",
       ]
     }
   }
 
   # Declare a group() that supports forwarding java dependency information.
   #
   # Example
   #  java_group("conditional_deps") {
   #    if (enable_foo) {
   #      deps = [":foo_java"]
   #    }
   #  }
   template("java_group") {
     write_build_config("${target_name}__build_config") {
-      forward_variables_from(invoker, [ "deps" ])
       type = "group"
       build_config = "$target_gen_dir/${invoker.target_name}.build_config"
+
+      if (defined(invoker.deps)) {
+        possible_config_deps = invoker.deps
+      }
     }
     group(target_name) {
-      deps = []
       forward_variables_from(invoker, "*")
+      if (!defined(deps)) {
+        deps = []
+      }
       deps += [ ":${target_name}__build_config" ]
     }
   }
 
   # Declare a target that generates localized strings.xml from a .grd file.
   #
   # If this target is included in the deps of an android resources/library/apk,
   # the strings.xml will be included with that target.
   #
   # Variables
   #   deps: Specifies the dependencies of this target.
   #   grd_file: Path to the .grd file to generate strings.xml from.
   #   outputs: Expected grit outputs (see grit rule).
   #
   # Example
   #  java_strings_grd("foo_strings_grd") {
   #    grd_file = "foo_strings.grd"
   #  }
   template("java_strings_grd") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     base_path = "$target_gen_dir/$target_name"
     resources_zip = base_path + ".resources.zip"
     build_config = base_path + ".build_config"
 
     write_build_config("${target_name}__build_config") {
-      forward_variables_from(invoker, [ "deps" ])
       type = "android_resources"
     }
 
     # Put grit files into this subdirectory of target_gen_dir.
     extra_output_path = target_name + "_grit_output"
 
     grit_target_name = "${target_name}__grit"
     grit_output_dir = "$target_gen_dir/$extra_output_path"
     grit(grit_target_name) {
+      forward_variables_from(invoker, [ "deps" ])
       grit_flags = [
         "-E",
         "ANDROID_JAVA_TAGGED_ONLY=false",
       ]
       output_dir = grit_output_dir
       resource_ids = ""
       source = invoker.grd_file
       outputs = invoker.outputs
     }
 
@@ skipping 40 matching lines @@
 
     base_path = "$target_gen_dir/$target_name"
     resources_zip = base_path + ".resources.zip"
     build_config = base_path + ".build_config"
 
     build_config_target_name = "${target_name}__build_config"
     zip_target_name = "${target_name}__zip"
     final_target_name = target_name
 
     write_build_config(build_config_target_name) {
-      visibility = [ ":$zip_target_name" ]
       type = "android_resources"
     }
 
     zip(zip_target_name) {
       visibility = [ ":$final_target_name" ]
 
       base_dir = invoker.grit_output_dir
       inputs = rebase_path(invoker.generated_files, ".", base_dir)
       output = resources_zip
       deps = [
@@ skipping 590 matching lines @@
       jar_path = _jar_path
       dex_path = final_dex_path
       apk_path = _final_apk_path
       incremental_apk_path = "${_final_apk_path_no_ext}_incremental.apk"
       incremental_install_script_path = _incremental_install_script_path
       resources_zip = resources_zip_path
       build_config = _build_config
       android_manifest = _android_manifest
 
       deps = _android_manifest_deps
+
       if (defined(invoker.deps)) {
-        deps += invoker.deps
+        possible_config_deps = invoker.deps
       }
 
       if (defined(invoker.alternative_locale_resource_dep)) {
-        deps += [ invoker.alternative_locale_resource_dep ]
+        possible_config_deps += [ invoker.alternative_locale_resource_dep ]
         has_alternative_locale_resource = true
       }
 
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
-        deps += [ "//third_party/android_tools:emma_device" ]
+        possible_config_deps += [ "//third_party/android_tools:emma_device" ]
       }
 
       proguard_enabled = _proguard_enabled
       if (_proguard_enabled) {
         proguard_info = "$_proguard_output_jar_path.info"
       }
 
       # Don't depend on the runtime_deps target in order to avoid having to
       # build the native libraries just to create the .build_config file.
       # The dep is unnecessary since the runtime_deps file is created by gn gen
@@ skipping 685 matching lines @@
       }
     }
 
     android_apk(target_name) {
       set_sources_assignment_filter([])
       data_deps = []
       deps = []
       forward_variables_from(invoker, "*")
       testonly = true
 
-      assert(!defined(invoker.proguard_enabled) || !invoker.proguard_enabled
-             || invoker.proguard_configs != [])
+      assert(!defined(invoker.proguard_enabled) || !invoker.proguard_enabled ||
+             invoker.proguard_configs != [])
 
       if (!defined(apk_name)) {
         apk_name = get_label_info(invoker.shared_library, "name")
       }
 
       if (!defined(android_manifest)) {
         android_manifest_dep = ":${target_name}_manifest"
         android_manifest = _android_manifest
       }
 
@@ skipping 148 matching lines @@
     android_library(target_name) {
       chromium_code = false
       java_files = []
       srcjar_deps = [ ":${_template_name}__protoc_java" ]
       deps = [
         "//third_party/android_protobuf:protobuf_nano_javalib",
       ]
     }
   }
 }