diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:34:38 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 18:34:38 +0000 |
| commit | cdccaa7fcd2db92c939f3d7788d50c9051e47af6 (patch) | |
| tree | a82e1e30f0eb4ca50b3199ef6916f6fc7f6addef /chrome/chrome.gyp | |
| parent | ad9c81b190353e9e47ac4a09af8f685f0f465445 (diff) | |
| download | chromium_src-cdccaa7fcd2db92c939f3d7788d50c9051e47af6.zip chromium_src-cdccaa7fcd2db92c939f3d7788d50c9051e47af6.tar.gz chromium_src-cdccaa7fcd2db92c939f3d7788d50c9051e47af6.tar.bz2 | |
Move mac_bundle_id and other variables from chrome.gyp to build/chrome_settings.gypi.
These variables could be used from any gypi file included from chrome.gyp.
However, policy_templates.gypi is moving into components/policy.gypi, which
is included from components/components.gyp instead.
Moving the variables to build/chrome_settings.gypi enables their use from other gyp files.
BUG=271392
Review URL: https://codereview.chromium.org/98363007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 0cc2365..deb868a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -23,8 +23,6 @@ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], - # TODO: remove this helper when we have loops in GYP - 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 'conditions': [ ['OS!="ios"', { 'chromium_browser_dependencies': [ @@ -81,19 +79,6 @@ 'tweak_info_plist_path': '../build/mac/tweak_info_plist.py', 'platform_locale_settings_grd': 'app/resources/locale_settings_mac.grd', - 'conditions': [ - ['branding=="Chrome"', { - 'mac_bundle_id': 'com.google.Chrome', - 'mac_creator': 'rimZ', - # The policy .grd file also needs the bundle id. - 'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'], - }, { # else: branding!="Chrome" - 'mac_bundle_id': 'org.chromium.Chromium', - 'mac_creator': 'Cr24', - # The policy .grd file also needs the bundle id. - 'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'], - }], # branding - ], # conditions }], # OS=="mac" ], # conditions }, # variables @@ -104,6 +89,7 @@ # on 64-bit Windows only. Targets that end with nacl_win64 should be used # by Native Client only. # NOTE: Most new includes should go in the OS!="ios" condition below. + '../build/chrome_settings.gypi', '../build/win_precompile.gypi', 'chrome_browser.gypi', 'chrome_browser_ui.gypi', |