GN: forward_variables_from shouldn't clobber vars.

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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 67 matching lines @@
     # TODO(cjhopman): #includes should probably all be relative to
     # base_output_dir. Remove that from this config once the includes are
     # updated.
     include_dirs = [
       base_output_dir,
       package_output_dir,
     ]
   }
 
   group(target_name) {
-    public_deps = []
     forward_variables_from(invoker,
                            [
                              "deps",
                              "public_deps",
                              "visibility",
                            ])
+    if (!defined(public_deps)) {
+      public_deps = []
+    }
     public_deps += [ ":$foreach_target_name" ]
     public_configs = [ ":jni_includes_${target_name}" ]
   }
 }
 
 # Declare a jni target for a prebuilt jar
 #
 # This target generates the native jni bindings for a set of classes in a .jar.
 #
 # See base/android/jni_generator/jni_generator.py for more info about the
@@ skipping 525 matching lines @@
     }
     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" ]
-    deps = []
     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" ]
 
     # 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 238 matching lines @@
 #   java_files: List of .java files included in this library.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
 #     dependencies for this target. This will allow depending on an
 #     android_library target, for example.
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   enable_errorprone: If true, enables the errorprone compiler.
-#   enable_incremental_javac: Overrides the global enable_incremental_javac.
+#   enable_incremental_javac_override: Overrides the
+#     global enable_incremental_javac.
 #   main_class: When specified, a wrapper script is created within
 #     $root_build_dir/bin to launch the binary with the given class as the
 #     entrypoint.
 #   wrapper_script_args: List of additional arguments for the wrapper script.
 #
 #   data_deps, testonly
 #
 # Example
 #   java_binary("foo") {
 #     java_files = [ "org/chromium/foo/FooMain.java" ]
@@ skipping 78 matching lines @@
 #     will be added to the javac classpath.
 #
 #   java_files: List of .java files included in this library.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   enable_errorprone: If true, enables the errorprone compiler.
-#   enable_incremental_javac: Overrides the global enable_incremental_javac.
+#   enable_incremental_javac_override: Overrides the global
+#     enable_incremental_javac.
 #
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   supports_android: If true, Android targets (android_library, android_apk)
 #     may depend on this target. Note: if true, this target must only use the
@@ skipping 68 matching lines @@
 #     will be used when building this library.
 #
 #   java_files: List of .java files included in this library.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   enable_errorprone: If true, enables the errorprone compiler.
-#   enable_incremental_javac: Overrides the global enable_incremental_javac.
+#   enable_incremental_javac_override: Overrides the global
+#     enable_incremental_javac.
 #
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   dex_path: If set, the resulting .dex.jar file will be placed under this
 #     path.
@@ skipping 152 matching lines @@
 #     R.java files.
 #   testonly: Marks this target as "test-only".
 #   write_asset_list: Adds an extra file to the assets, which contains a list of
 #     all other asset files.
 #   alternative_locale_resource_dep: The locale resource target which overrides
 #     any exsting locale resources in dep graph.
 #   requires_sdk_api_level_23: If defined and true, the apk is intended for
 #     installation only on Android M or later. In these releases the system
 #     linker does relocation unpacking, so we can enable it unconditionally.
 #   secondary_native_libs: the path of native libraries for secondary app abi.
+#   run_findbugs_override: Forces run_findbugs on or off. If undefined, the
+#     default will use the build arg run_findbugs.
 #
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
 #     java_files = [
 #       "android/org/chromium/foo/FooApplication.java",
 #       "android/org/chromium/foo/FooActivity.java",
 #     ]
 #     deps = [
 #       ":foo_support_java"
@@ skipping 267 matching lines @@
     }
     _srcjar_deps += [ ":${_template_name}__build_config_java" ]
   }
 
   java_target = "${_template_name}__java"
   java_library_impl(java_target) {
     forward_variables_from(invoker,
                            [
                              "chromium_code",
                              "java_files",
-                             "run_findbugs",
+                             "run_findbugs_override",
                            ])
     supports_android = true
     requires_android = true
     override_build_config = _build_config
     deps = _android_manifest_deps + [ ":$build_config_target" ]
 
     android_manifest = _android_manifest
     srcjar_deps = _srcjar_deps
     jar_path = _jar_path
     dex_path = _lib_dex_path
@@ skipping 82 matching lines @@
   } else {
     if (enable_multidex) {
       _dex_sources = [ _jar_path ]
     } else {
       _dex_sources = [ _lib_dex_path ]
     }
     _dex_deps = [ ":$java_target" ]
   }
 
   dex("$final_dex_target_name") {
-    forward_variables_from(invoker, [ "enable_multidex" ])
     deps = _dex_deps + [ ":$build_config_target" ]
     inputs = [
       _build_config,
     ]
     sources = _dex_sources
     output = final_dex_path
 
     # All deps are already included in _dex_sources when proguard is used.
     if (!_proguard_enabled) {
       if (enable_multidex) {
@@ skipping 70 matching lines @@
       _extra_native_libs_deps +=
           [ "//base/android/linker:chromium_android_linker" ]
     }
   }
   if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
     _extra_native_libs_even_when_incremental += invoker.loadable_modules
   }
 
   _final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
-    deps = []
     forward_variables_from(invoker,
                            [
                              "alternative_android_sdk_jar",
                              "android_aapt_path",
                              "app_as_shared_lib",
                              "deps",
                              "extensions_to_not_compress",
                              "language_splits",
                              "page_align_shared_libraries",
                              "public_deps",
                              "secondary_native_libs",
                              "shared_resources",
                              "uncompress_shared_libraries",
                              "write_asset_list",
                            ])
+    if (!defined(deps)) {
+      deps = []
+    }
     apk_path = _final_apk_path
     android_manifest = _android_manifest
     assets_build_config = _build_config
     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
     emma_instrument = emma_coverage && !_emma_never_instrument
 
     if (!defined(extensions_to_not_compress)) {
@@ skipping 143 matching lines @@
 
   group(target_name) {
     forward_variables_from(invoker,
                            [
                              "data",
                              "data_deps",
                            ])
     public_deps = _final_deps
   }
   group("${target_name}_incremental") {
-    data_deps = []
     forward_variables_from(invoker,
                            [
                              "data",
                              "data_deps",
                            ])
+    if (!defined(data_deps)) {
+      data_deps = []
+    }
 
     # device/commands is used by the installer script to push files via .zip.
     data_deps += [ "//build/android/pylib/device/commands" ] +
                  _native_libs_deps + _extra_native_libs_deps
 
     # Since the _incremental.apk does not include use .so nor .dex from the
     # actual target, but instead loads them at runtime, we need to explicitly
     # depend on them here.
     public_deps = [
       ":${_create_incremental_script_rule_name}",
@@ skipping 82 matching lines @@
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
     if (defined(invoker.additional_apks)) {
       data_deps += invoker.additional_apks
     }
 
     create_dist_ijar = true
-    run_findbugs = defined(invoker.run_findbugs) && invoker.run_findbugs &&
-                   defined(invoker.java_files)
+    if (defined(invoker.run_findbugs_override)) {
+      # Only allow findbugs when there are java files.
+      run_findbugs_override =
+          invoker.run_findbugs_override && defined(invoker.java_files)
+    }
   }
 
   group(target_name) {
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
 
       # Required by test runner to enumerate test list.
       ":${_apk_target_name}_dist_ijar",
     ]
@@ skipping 365 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }