GN: Fix ChromePublic crash on launch from misconfigured resource overrides

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index ceef92f12c78cc117f5d266e91e9535e515c0a9e..d5a440eb303227ab772e567535a8600e9df46b7f 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -43,10 +43,10 @@ locale_pak_resources("chrome_locale_paks") {
 
 # 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",
@@ -334,9 +334,13 @@ android_library("chrome_shared_test_java") {
   ]
 }
 
+# Overrides icon / name defined in chrome_java_resources.
 android_resources("chrome_public_apk_resources") {
   resource_dirs = [ "java/res_chromium" ]
   custom_package = "org.chromium.chrome"
+  deps = [
+    ":chrome_java_resources",

[newt (away), 2015/09/15 00:59:37]

Does this ensure that these resources override chrome_java_resources? I'd
document that fact clearly since it's subtle and can easily break if this ever
gets refactored.

[agrieve, 2015/09/15 14:19:12]

Added a comment. The logic for this actually already existed within
write_build_config.py, but the logic in process_resources.py was broken.

+  ]
 }
 
 chrome_public_apk_assets_dir = "$root_build_dir/chrome_public_apk_assets"
@@ -425,7 +429,6 @@ android_apk("chrome_public_apk") {
 
   deps = [
     ":chrome_java",
-    ":chrome_java_resources",
     ":chrome_public",
     ":chrome_public_apk_assets",
     ":chrome_public_apk_manifest",