diff options
| author | gburanov <gburanov@gmail.com> | 2015-04-28 16:25:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 23:25:35 +0000 |
| commit | eaf365a0d6373700b3cb8d51a6de09e52039461c (patch) | |
| tree | beace257509d935b8d288592c607b47abb7d4621 | |
| parent | 654644c800bf663c6a1c35e81c9d2db9759103d1 (diff) | |
| download | chromium_src-eaf365a0d6373700b3cb8d51a6de09e52039461c.zip chromium_src-eaf365a0d6373700b3cb8d51a6de09e52039461c.tar.gz chromium_src-eaf365a0d6373700b3cb8d51a6de09e52039461c.tar.bz2 | |
use 'branding_path_component' to simplify branding in chrome main directory (and crash service) - part 2
Also in context of this review crash service is also using 'branding_path_component'
Please take look at
https://codereview.chromium.org/1090213002/patch/40001/50001
for details
BUG=
Review URL: https://codereview.chromium.org/1114453002
Cr-Commit-Position: refs/heads/master@{#327388}
| -rw-r--r-- | chrome/chrome.gyp | 11 | ||||
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 8 | ||||
| -rw-r--r-- | chrome/tools/crash_service/caps/caps.gyp | 12 |
3 files changed, 4 insertions, 27 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 46108ee..7a6b421 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -76,15 +76,8 @@ ['OS=="linux"', { 'conditions': [ ['chromeos==1', { - 'conditions': [ - ['branding=="Chrome"', { - 'platform_locale_settings_grd': - 'app/resources/locale_settings_google_chromeos.grd', - }, { # branding!=Chrome - 'platform_locale_settings_grd': - 'app/resources/locale_settings_chromiumos.grd', - }], - ] + 'platform_locale_settings_grd': + 'app/resources/locale_settings_<(branding_path_component)os.grd', }, { # chromeos==0 'platform_locale_settings_grd': 'app/resources/locale_settings_linux.grd', diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 18996b9..a938500 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -101,14 +101,8 @@ }, ], 'variables': { - 'conditions': [ - ['branding=="Chrome"', { - 'theme_dir_name': 'google_chrome', - }, { # else: 'branding!="Chrome" - 'theme_dir_name': 'chromium', - }], - ], 'libpeer_target_type%': 'static_library', + 'theme_dir_name': '<(branding_path_component)', }, 'postbuilds': [ { diff --git a/chrome/tools/crash_service/caps/caps.gyp b/chrome/tools/crash_service/caps/caps.gyp index 42fbead..9379c52 100644 --- a/chrome/tools/crash_service/caps/caps.gyp +++ b/chrome/tools/crash_service/caps/caps.gyp @@ -13,18 +13,8 @@ { 'target_name': 'caps_resources', 'type': 'none', - 'conditions': [ - ['branding == "Chrome"', { - 'variables': { - 'branding_path': '../../../app/theme/google_chrome/BRANDING', - }, - }, { # else branding!="Chrome" - 'variables': { - 'branding_path': '../../../app/theme/chromium/BRANDING', - }, - }], - ], 'variables': { + 'branding_path': '../../../app/theme/<(branding_path_component)/BRANDING', 'output_dir': 'caps', 'template_input_path': '../../../app/chrome_version.rc.version', }, |