From 60e61e8a7f98c447baadb317ad56d49c755e0071 Mon Sep 17 00:00:00 2001 From: Newton Allen Date: Mon, 17 Aug 2015 13:42:17 -0700 Subject: [PATCH] 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} --- chrome/android/BUILD.gn | 8 ++++---- .../drawable-hdpi/fre_product_logo.png | Bin .../drawable-hdpi/product_logo_name.png | Bin .../drawable-mdpi/fre_product_logo.png | Bin .../drawable-mdpi/product_logo_name.png | Bin .../drawable-xhdpi/fre_product_logo.png | Bin .../drawable-xhdpi/product_logo_name.png | Bin .../drawable-xxhdpi/fre_product_logo.png | Bin .../drawable-xxhdpi/product_logo_name.png | Bin .../drawable-xxxhdpi/fre_product_logo.png | Bin .../drawable-xxxhdpi/product_logo_name.png | Bin .../mipmap-hdpi/app_icon.png | Bin .../mipmap-hdpi/app_shortcut_icon.png | Bin .../mipmap-mdpi/app_icon.png | Bin .../mipmap-mdpi/app_shortcut_icon.png | Bin .../mipmap-xhdpi/app_icon.png | Bin .../mipmap-xhdpi/app_shortcut_icon.png | Bin .../mipmap-xxhdpi/app_icon.png | Bin .../mipmap-xxhdpi/app_shortcut_icon.png | Bin .../mipmap-xxxhdpi/app_icon.png | Bin .../mipmap-xxxhdpi/app_shortcut_icon.png | Bin .../values/channel_constants.xml | 0 chrome/chrome.gyp | 8 +++++--- 23 files changed, 9 insertions(+), 7 deletions(-) rename chrome/android/java/{res => res_chromium}/drawable-hdpi/fre_product_logo.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-hdpi/product_logo_name.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-mdpi/fre_product_logo.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-mdpi/product_logo_name.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xhdpi/fre_product_logo.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xhdpi/product_logo_name.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xxhdpi/fre_product_logo.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xxhdpi/product_logo_name.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xxxhdpi/fre_product_logo.png (100%) rename chrome/android/java/{res => res_chromium}/drawable-xxxhdpi/product_logo_name.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-hdpi/app_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-hdpi/app_shortcut_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-mdpi/app_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-mdpi/app_shortcut_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xhdpi/app_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xhdpi/app_shortcut_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xxhdpi/app_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xxhdpi/app_shortcut_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xxxhdpi/app_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/mipmap-xxxhdpi/app_shortcut_icon.png (100%) rename chrome/android/java/{res_default => res_chromium}/values/channel_constants.xml (100%) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 6d6baacc0ce2bb..4cbd447a61bc13 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 similarity index 100% rename from chrome/android/java/res/drawable-hdpi/fre_product_logo.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-hdpi/product_logo_name.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-mdpi/fre_product_logo.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-mdpi/product_logo_name.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/fre_product_logo.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xhdpi/product_logo_name.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/fre_product_logo.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xxhdpi/product_logo_name.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xxxhdpi/fre_product_logo.png rename to 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 similarity index 100% rename from chrome/android/java/res/drawable-xxxhdpi/product_logo_name.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-hdpi/app_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-hdpi/app_shortcut_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-mdpi/app_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-mdpi/app_shortcut_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xhdpi/app_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xhdpi/app_shortcut_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xxhdpi/app_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xxhdpi/app_shortcut_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xxxhdpi/app_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/mipmap-xxxhdpi/app_shortcut_icon.png rename to 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 similarity index 100% rename from chrome/android/java/res_default/values/channel_constants.xml rename to chrome/android/java/res_chromium/values/channel_constants.xml diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 11c5b3e796b8c8..cd18077bdeaac6 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': [ - '