GN: Fix ChromePublic crash on launch from misconfigured resource overrides

chrome/android/BUILD.gn

 # 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/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 25 matching lines @@
 locale_pak_resources("chrome_locale_paks") {
   sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources
 
   deps = [
     "//chrome:packed_resources",
   ]
 }
 
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
 android_resources("chrome_java_resources") {
-  if (!defined(android_branding_res_dirs)) {
-    android_branding_res_dirs = [ "//chrome/android/java/res_chromium" ]
-  }
-  resource_dirs = [ "java/res" ] + android_branding_res_dirs
+  resource_dirs = [
+    "java/res",
+    "//chrome/android/java/res_chromium",
+  ]
   deps = [
     ":chrome_locale_paks",
     ":chrome_strings_grd",
     "//components/policy:app_restrictions_resources",
     "//content/public/android:content_java_resources",
     "//chrome/app:java_strings_grd",
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_media:android_media_resources",
   ]
   if (!enable_configuration_policy) {
@@ skipping 267 matching lines @@
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
     "//ui/android:ui_javatests",
   ]
 }
 
+# Overrides icon / name defined in chrome_java_resources.
 android_resources("chrome_public_apk_resources") {
   resource_dirs = [ "java/res_chromium" ]
-  custom_package = "org.chromium.chrome"
+
+  # Dep needed to ensure override works properly.
+  deps = [
+    ":chrome_java_resources",
+  ]
 }
 
 chrome_public_apk_assets_dir = "$root_build_dir/chrome_public_apk_assets"
 
 copy_ex("chrome_public_apk_assets") {
   clear_dir = true
   dest = chrome_public_apk_assets_dir
   sources = chrome_android_paks_gypi.chrome_android_pak_input_resources
   if (icu_use_data_file) {
     sources += [ "$root_build_dir/icudtl.dat" ]
@@ skipping 68 matching lines @@
   apk_name = "ChromePublic"
   native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ]
   native_lib_version_rule = "//build/util:chrome_version_json"
   _native_lib_file =
       rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
   native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
   asset_location = chrome_public_apk_assets_dir
 
   deps = [
     ":chrome_java",
-    ":chrome_java_resources",
     ":chrome_public",
     ":chrome_public_apk_assets",
     ":chrome_public_apk_manifest",
     ":chrome_public_apk_resources",
     ":chrome_public_template_resources",
     "//base:base_java",
     google_play_services_resources,
   ]
 }
 
@@ skipping 12 matching lines @@
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/android:chrome_shared_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }