diff options
| author | Newton Allen <newt@chromium.org> | 2015-08-17 13:42:17 -0700 |
|---|---|---|
| committer | Newton Allen <newt@chromium.org> | 2015-08-17 20:43:29 +0000 |
| commit | 60e61e8a7f98c447baadb317ad56d49c755e0071 (patch) | |
| tree | e46c7018d12738c214d1034ef2bc72ffaff9db67 /chrome/chrome.gyp | |
| parent | 2b4dd97adb47e768a3e3eb2b6b8f97daf14df66a (diff) | |
| download | chromium_src-60e61e8a7f98c447baadb317ad56d49c755e0071.zip chromium_src-60e61e8a7f98c447baadb317ad56d49c755e0071.tar.gz chromium_src-60e61e8a7f98c447baadb317ad56d49c755e0071.tar.bz2 | |
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}
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
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)', ], }, |