Allow overriding Chromium-branded Android resources.

The chrome_java target includes several resources that are specific to a
Chromium-branded build (e.g. the Chromium icon and app name). It's now
possible to set a value for the GYP/GN variable
android_branding_res_dirs to override the directory in which these
branding resources live. This enables easy swapping of the resources
when building, e.g., a Google Chrome-branded build.

R=yfriedman@chromium.org
TBR=thestig@chromium.org
BUG=520794,474747

Review URL: https://codereview.chromium.org/1301613002 .

Cr-Commit-Position: refs/heads/master@{#343746}

23 files changed, 9 insertions, 7 deletions

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 6d6baac..4cbd447 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") {
-  resource_dirs = [
-    "java/res",
-    "java/res_default",
-  ]
+  if (!defined(android_branding_res_dirs)) {
+    android_branding_res_dirs = [ "//chrome/android/java/res_chromium" ]
+  }
+  resource_dirs = [ "java/res" ] + android_branding_res_dirs
   deps = [
     ":chrome_locale_paks",
     ":chrome_strings_grd",
diff --git a/chrome/android/java/res/drawable-hdpi/fre_product_logo.png b/chrome/android/java/res_chromium/drawable-hdpi/fre_product_logo.png
index 64f3f83..64f3f83 100644
--- a/chrome/android/java/res/drawable-hdpi/fre_product_logo.png
+++ b/chrome/android/java/res_chromium/drawable-hdpi/fre_product_logo.png
diff --git a/chrome/android/java/res/drawable-hdpi/product_logo_name.png b/chrome/android/java/res_chromium/drawable-hdpi/product_logo_name.png
index 6bc0d29..6bc0d29 100644
--- a/chrome/android/java/res/drawable-hdpi/product_logo_name.png
+++ b/chrome/android/java/res_chromium/drawable-hdpi/product_logo_name.png
diff --git a/chrome/android/java/res/drawable-mdpi/fre_product_logo.png b/chrome/android/java/res_chromium/drawable-mdpi/fre_product_logo.png
index c8ee231..c8ee231 100644
--- a/chrome/android/java/res/drawable-mdpi/fre_product_logo.png
+++ b/chrome/android/java/res_chromium/drawable-mdpi/fre_product_logo.png
diff --git a/chrome/android/java/res/drawable-mdpi/product_logo_name.png b/chrome/android/java/res_chromium/drawable-mdpi/product_logo_name.png
index d6ace5d..d6ace5d 100644
--- a/chrome/android/java/res/drawable-mdpi/product_logo_name.png
+++ b/chrome/android/java/res_chromium/drawable-mdpi/product_logo_name.png
diff --git a/chrome/android/java/res/drawable-xhdpi/fre_product_logo.png b/chrome/android/java/res_chromium/drawable-xhdpi/fre_product_logo.png
index 1a23d18..1a23d18 100644
--- a/chrome/android/java/res/drawable-xhdpi/fre_product_logo.png
+++ b/chrome/android/java/res_chromium/drawable-xhdpi/fre_product_logo.png
diff --git a/chrome/android/java/res/drawable-xhdpi/product_logo_name.png b/chrome/android/java/res_chromium/drawable-xhdpi/product_logo_name.png
index d8187c0..d8187c0 100644
--- a/chrome/android/java/res/drawable-xhdpi/product_logo_name.png
+++ b/chrome/android/java/res_chromium/drawable-xhdpi/product_logo_name.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/fre_product_logo.png b/chrome/android/java/res_chromium/drawable-xxhdpi/fre_product_logo.png
index dd654a7..dd654a7 100644
--- a/chrome/android/java/res/drawable-xxhdpi/fre_product_logo.png
+++ b/chrome/android/java/res_chromium/drawable-xxhdpi/fre_product_logo.png
diff --git a/chrome/android/java/res/drawable-xxhdpi/product_logo_name.png b/chrome/android/java/res_chromium/drawable-xxhdpi/product_logo_name.png
index 0a887a3..0a887a3 100644
--- a/chrome/android/java/res/drawable-xxhdpi/product_logo_name.png
+++ b/chrome/android/java/res_chromium/drawable-xxhdpi/product_logo_name.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/fre_product_logo.png b/chrome/android/java/res_chromium/drawable-xxxhdpi/fre_product_logo.png
index 6594440..6594440 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/fre_product_logo.png
+++ b/chrome/android/java/res_chromium/drawable-xxxhdpi/fre_product_logo.png
diff --git a/chrome/android/java/res/drawable-xxxhdpi/product_logo_name.png b/chrome/android/java/res_chromium/drawable-xxxhdpi/product_logo_name.png
index 0118d3f..0118d3f 100644
--- a/chrome/android/java/res/drawable-xxxhdpi/product_logo_name.png
+++ b/chrome/android/java/res_chromium/drawable-xxxhdpi/product_logo_name.png
diff --git a/chrome/android/java/res_default/mipmap-hdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png
index 7c12581..7c12581 100644
--- a/chrome/android/java/res_default/mipmap-hdpi/app_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-hdpi/app_icon.png
diff --git a/chrome/android/java/res_default/mipmap-hdpi/app_shortcut_icon.png b/chrome/android/java/res_chromium/mipmap-hdpi/app_shortcut_icon.png
index 3e2691e..3e2691e 100644
--- a/chrome/android/java/res_default/mipmap-hdpi/app_shortcut_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-hdpi/app_shortcut_icon.png
diff --git a/chrome/android/java/res_default/mipmap-mdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png
index 005468f..005468f 100644
--- a/chrome/android/java/res_default/mipmap-mdpi/app_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-mdpi/app_icon.png
diff --git a/chrome/android/java/res_default/mipmap-mdpi/app_shortcut_icon.png b/chrome/android/java/res_chromium/mipmap-mdpi/app_shortcut_icon.png
index be3e5df..be3e5df 100644
--- a/chrome/android/java/res_default/mipmap-mdpi/app_shortcut_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-mdpi/app_shortcut_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png
index a0c26ef..a0c26ef 100644
--- a/chrome/android/java/res_default/mipmap-xhdpi/app_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xhdpi/app_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xhdpi/app_shortcut_icon.png b/chrome/android/java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png
index 950ae48..950ae48 100644
--- a/chrome/android/java/res_default/mipmap-xhdpi/app_shortcut_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xhdpi/app_shortcut_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xxhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png
index bb216c1..bb216c1 100644
--- a/chrome/android/java/res_default/mipmap-xxhdpi/app_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xxhdpi/app_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xxhdpi/app_shortcut_icon.png b/chrome/android/java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png
index 9480b69..9480b69 100644
--- a/chrome/android/java/res_default/mipmap-xxhdpi/app_shortcut_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xxhdpi/app_shortcut_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xxxhdpi/app_icon.png b/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png
index 1349791..1349791 100644
--- a/chrome/android/java/res_default/mipmap-xxxhdpi/app_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_icon.png
diff --git a/chrome/android/java/res_default/mipmap-xxxhdpi/app_shortcut_icon.png b/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png
index 35e9730..35e9730 100644
--- a/chrome/android/java/res_default/mipmap-xxxhdpi/app_shortcut_icon.png
+++ b/chrome/android/java/res_chromium/mipmap-xxxhdpi/app_shortcut_icon.png
diff --git a/chrome/android/java/res_default/values/channel_constants.xml b/chrome/android/java/res_chromium/values/channel_constants.xml
index e19405f..e19405f 100644
--- a/chrome/android/java/res_default/values/channel_constants.xml
+++ b/chrome/android/java/res_chromium/values/channel_constants.xml
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 11c5b3e..cd18077 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -620,19 +620,21 @@
             '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
+            'variables': {
+              'android_branding_res_dirs%': ['<(java_in_dir)/res_chromium'],
+            },
             'java_in_dir': '../chrome/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.chrome',
             'R_package_relpath': 'org/chromium/chrome',
             # Include channel-specific resources and xml string files generated
             # from generated_resources.grd
-            'res_channel_dir': '<(java_in_dir)/res_default',
             'res_extra_dirs': [
-              '<(res_channel_dir)',
+              '<@(android_branding_res_dirs)',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
             ],
             'res_extra_files': [
-              '<!@(find <(res_channel_dir) -type f)',
+              '<!@(find <(android_branding_res_dirs) -type f)',
               '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
             ],
           },