GN: Fix ChromePublic crash on launch from misconfigured resource overrides

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/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 587 matching lines @@
 #   android_manifest: AndroidManifest.xml for this target. Defaults to
 #     //build/android/AndroidManifest.xml.
 #   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.
 #
 
-# Example
+# Example:
 #   android_resources("foo_resources") {
 #     deps = [":foo_strings_grd"]
 #     resource_dirs = ["res"]
 #     custom_package = "org.chromium.foo"
 #   }
+#
+#   android_resources("foo_resources_overrides") {
+#     deps = [":foo_resources"]
+#     resource_dirs = ["res_overrides"]
+#   }
 template("android_resources") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   assert(defined(invoker.resource_dirs))
-  assert(defined(invoker.android_manifest) || defined(invoker.custom_package))
 
   base_path = "$target_gen_dir/$target_name"
   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) {
     forward_variables_from(invoker,
                            [
                              "android_manifest",
                              "custom_package",
                              "deps",
                            ])
+
+    # 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
-    r_text = r_text_path
   }
 
   process_resources(process_resources_target_name) {
     visibility = [ ":$final_target_name" ]
     deps = []
     forward_variables_from(invoker,
                            [
                              "android_manifest",
                              "custom_package",
                              "deps",
@@ skipping 1356 matching lines @@
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }