[Android] Additional forward_variables_from conversions.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 4c6c4bbd300f7dfac05774a1b2ad26cac4f3decd..2be45da6cd7ef9ce7a66b59157d5fb8d62343fdf 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1267,6 +1267,7 @@ template("android_apk") {
 
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {
+    forward_variables_from(invoker, [ "apk_under_test" ])
     type = "android_apk"
     dex_path = final_dex_path
     resources_zip = resources_zip_path
@@ -1278,10 +1279,6 @@ template("android_apk") {
       deps += invoker.deps
     }
 
-    if (defined(invoker.apk_under_test)) {
-      apk_under_test = invoker.apk_under_test
-    }
-
     native_libs = _native_libs
   }
 
@@ -1290,6 +1287,7 @@ template("android_apk") {
   process_resources_target = "${_template_name}__process_resources"
   final_deps += [ ":$process_resources_target" ]
   process_resources(process_resources_target) {
+    forward_variables_from(invoker, [ "include_all_resources" ])
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     r_text_path = "${target_gen_dir}/${target_name}_R.txt"
     android_manifest = _android_manifest
@@ -1298,10 +1296,6 @@ template("android_apk") {
     all_resources_zip_path = _all_resources_zip_path
     generate_constant_ids = true
 
-    if (defined(invoker.include_all_resources)) {
-      include_all_resources = invoker.include_all_resources
-    }
-
     build_config = _build_config
     deps = _android_manifest_deps + [ ":$build_config_target" ]
     if (defined(invoker.deps)) {
@@ -1352,6 +1346,7 @@ template("android_apk") {
   java_target = "${_template_name}__java"
   final_deps += [ ":$java_target" ]
   java_library_impl(java_target) {
+    forward_variables_from(invoker, [ "run_findbugs" ])
     supports_android = true
     requires_android = true
     override_build_config = _build_config
@@ -1369,10 +1364,6 @@ template("android_apk") {
     srcjar_deps = _srcjar_deps
     dex_path = base_path + ".dex.jar"
 
-    if (defined(invoker.run_findbugs)) {
-      run_findbugs = invoker.run_findbugs
-    }
-
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ -1431,6 +1422,11 @@ template("android_apk") {
 
   if (_native_libs != []) {
     action("${_template_name}__prepare_native") {
+      forward_variables_from(invoker,
+                             [
+                               "data_deps",
+                               "public_deps",
+                             ])
       script = "//build/android/gyp/pack_relocations.py"
       packed_libraries_dir = "$_native_libs_dir/$android_app_abi"
       depfile = "$target_gen_dir/$target_name.d"
@@ -1473,12 +1469,6 @@ template("android_apk") {
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
-      if (defined(invoker.public_deps)) {
-        public_deps = invoker.public_deps
-      }
-      if (defined(invoker.data_deps)) {
-        data_deps = invoker.data_deps
-      }
 
       if (is_debug) {
         rebased_gdbserver = rebase_path([ android_gdbserver ], root_build_dir)
@@ -1490,15 +1480,13 @@ template("android_apk") {
 
   final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
+    forward_variables_from(invoker, [ "language_splits" ])
     apk_path = _final_apk_path
     android_manifest = _android_manifest
     resources_zip = _all_resources_zip_path
     dex_path = final_dex_path
     load_library_from_apk = _load_library_from_apk
     create_density_splits = _create_density_splits
-    if (defined(invoker.language_splits)) {
-      language_splits = invoker.language_splits
-    }
     if (defined(invoker.extensions_to_not_compress)) {
       extensions_to_not_compress = invoker.extensions_to_not_compress
     } else {
@@ -1580,10 +1568,8 @@ template("android_apk") {
   }
 
   group(target_name) {
+    forward_variables_from(invoker, [ "data_deps" ])
     deps = final_deps
-    if (defined(invoker.data_deps)) {
-      data_deps = invoker.data_deps
-    }
   }
 }
 
@@ -1638,12 +1624,10 @@ template("instrumentation_test_apk") {
   if (defined(invoker.apk_name)) {
     test_runner_data_dep = [ ":${_template_name}__test_runner_script" ]
     test_runner_script("${_template_name}__test_runner_script") {
+      forward_variables_from(invoker, [ "isolate_file" ])
       test_name = invoker.target_name
       test_type = "instrumentation"
       test_apk = invoker.apk_name
-      if (defined(invoker.isolate_file)) {
-        isolate_file = invoker.isolate_file
-      }
     }
   }
 
@@ -1712,6 +1696,7 @@ template("unittest_apk") {
   }
 
   android_apk(target_name) {
+    forward_variables_from(invoker, [ "asset_location" ])
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
     java_files = [
       "//testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
@@ -1721,9 +1706,6 @@ template("unittest_apk") {
     ]
     android_manifest = "//testing/android/native_test/java/AndroidManifest.xml"
     native_libs = [ unittests_binary ]
-    if (defined(invoker.asset_location)) {
-      asset_location = invoker.asset_location
-    }
     deps = [
       "//base:base_java",
       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
@@ -1852,6 +1834,7 @@ template("create_native_executable_dist") {
   copy_target_name = "${template_name}__copy_libraries_and_exe"
 
   action(find_deps_target_name) {
+    forward_variables_from(invoker, [ "deps" ])
     visibility = [ ":$copy_target_name" ]
 
     script = "//build/android/gyp/write_ordered_libraries.py"
@@ -1876,9 +1859,6 @@ template("create_native_executable_dist") {
       "--readelf",
       rebase_path(android_readelf, root_build_dir),
     ]
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
   }
 
   copy_ex(copy_target_name) {
@@ -1906,9 +1886,7 @@ template("create_native_executable_dist") {
   }
 
   group(template_name) {
-    if (defined(invoker.visibility)) {
-      visibility = invoker.visibility
-    }
+    forward_variables_from(invoker, [ "visibility" ])
     deps = [
       ":$copy_target_name",
     ]