From be076f940c3d02a690b876095eca988bb49d1930 Mon Sep 17 00:00:00 2001 From: gburanov Date: Tue, 28 Apr 2015 05:17:33 -0700 Subject: simplify branding Please take look at https://codereview.chromium.org/1090213002/patch/40001/50001 for details BUG= Review URL: https://codereview.chromium.org/1059333004 Cr-Commit-Position: refs/heads/master@{#327270} --- chrome_elf/chrome_elf.gyp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'chrome_elf') diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 0b612a8..cbbb4b4 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -15,19 +15,9 @@ { 'target_name': 'chrome_elf_resources', 'type': 'none', - 'conditions': [ - ['branding == "Chrome"', { - 'variables': { - 'branding_path': '../chrome/app/theme/google_chrome/BRANDING', - }, - }, { # else branding!="Chrome" - 'variables': { - 'branding_path': '../chrome/app/theme/chromium/BRANDING', - }, - }], - ], 'variables': { 'output_dir': 'chrome_elf', + 'branding_path': '../chrome/app/theme/<(branding_path_component)/BRANDING', 'template_input_path': '../chrome/app/chrome_version.rc.version', }, 'sources': [ -- cgit v1.1