Enable stricter resource overriding check by default

This CL:
- Forces on check that resource_overlay is specified if target
overrides resources for non-test targets. Disables check by default for
tests. The check is not on by default for tests because tests like
clank_junit_tests include resources with the same name but from
different dynamic feature modules
- Adds enforce_resource_overlays_in_tests flag to enable tests to enable
check.

BUG=1093825

Change-Id: Id0ac645b6f338b1f2c3a6ce75b6be35f9de6e29c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391606
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814281}

build/config/android/internal_rules.gni

@@ -2611,8 +2611,9 @@ if (enable_java_templates) {
                  "${invoker.shared_resources_allowlist_locales}" ]
     }
 
-    if (defined(invoker.enforce_resource_overlays) &&
-        invoker.enforce_resource_overlays) {
+    if (!defined(testonly) || !testonly ||
+        (defined(invoker.enforce_resource_overlays_in_tests) &&
+         invoker.enforce_resource_overlays_in_tests)) {
       _args += [ "--dependencies-res-zip-overlays=@FileArg($_rebased_build_config:deps_info:dependency_zip_overlays)" ]
     } else {
       _args += [ "--dependencies-res-zip-overlays=@FileArg($_rebased_build_config:deps_info:dependency_zips)" ]

build/config/android/rules.gni

@@ -2243,6 +2243,10 @@ if (enable_java_templates) {
   #   resource_ids_provider_dep: If passed, this target will use the resource
   #     IDs generated by {resource_ids_provider_dep}__compile_res during
   #     resource compilation.
+  #   enforce_resource_overlays_in_tests: Enables check for testonly targets that
+  #     dependent resource targets which override another target set
+  #     overlay_resources=true. This check is on for non-test targets and
+  #     cannot be disabled.
   #   static_library_dependent_targets: A list of scopes describing targets that
   #     use this target as a static library. Common Java code from the targets
   #     listed in static_library_dependent_targets will be moved into this
@@ -2618,7 +2622,7 @@ if (enable_java_templates) {
                              [
                                "aapt_locale_allowlist",
                                "app_as_shared_lib",
-                               "enforce_resource_overlays",
+                               "enforce_resource_overlays_in_tests",
                                "expected_android_manifest",
                                "expected_android_manifest_base",
                                "manifest_package",
@@ -3602,7 +3606,7 @@ if (enable_java_templates) {
                                "enable_jetify",
                                "enable_multidex",
                                "enable_native_mocks",
-                               "enforce_resource_overlays",
+                               "enforce_resource_overlays_in_tests",
                                "expected_android_manifest",
                                "expected_android_manifest_base",
                                "expected_libs_and_assets",
@@ -3741,7 +3745,6 @@ if (enable_java_templates) {
                                "data_deps",
                                "deps",
                                "enable_multidex",
-                               "enforce_resource_overlays",
                                "expected_android_manifest",
                                "expected_android_manifest_base",
                                "generate_buildconfig_java",

chrome/android/BUILD.gn

@@ -1993,8 +1993,6 @@ template("chrome_public_apk_or_module_tmpl") {
                            ])
     deps = _chrome_public_shared_deps
 
-    enforce_resource_overlays = true
-
     if (_is_bundle_module) {
       deps += [ ":chrome_bundle_module_pak_assets" ]
     } else {
@@ -2351,7 +2349,7 @@ template("chrome_test_apk_tmpl") {
                              "android_manifest_dep",
                              "data_deps",
                              "enable_lint",
-                             "enforce_resource_overlays",
+                             "enforce_resource_overlays_in_tests",
                              "shared_libraries",
                            ])
 
@@ -2468,13 +2466,16 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
   if (enable_chrome_android_internal) {
     data_deps += [ "//clank/build/bot/filters:chrome_public_test_apk_filters" ]
   }
+
+  # Required by //build/config/android/test/resource_overlay:javatests
+  enforce_resource_overlays_in_tests = true
+
   additional_apks = [
     "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
     "//chrome/android/webapk/shell_apk:javatests_webapk",
     "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
     "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
   ]
-  enforce_resource_overlays = true
 }
 
 if (enable_vr) {