diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:39:17 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-09 22:39:17 +0000 |
| commit | 02a46a3c1f824675fe72f5fe6a7b95694452a1eb (patch) | |
| tree | 279b1cff02e0915962dbe28a86a422c75ecebf27 /chrome/chrome_dll.gypi | |
| parent | 1d075ecac5642dd52fa1fc8f07f08924dd9b6393 (diff) | |
| download | chromium_src-02a46a3c1f824675fe72f5fe6a7b95694452a1eb.zip chromium_src-02a46a3c1f824675fe72f5fe6a7b95694452a1eb.tar.gz chromium_src-02a46a3c1f824675fe72f5fe6a7b95694452a1eb.tar.bz2 | |
Take Keystone keys out of the framework's Info.plist. They now live only in
the outer application's Info.plist.
This ensures that the framework and other contents of the versioned directory
can be bit-for-bit identical for a given version, regardless of configured
Keystone channel. This will enable binary diff updates, because they will not
need knowledge of the channel a user is upgrading from.
BUG=45017
TEST=Keystone still functions properly, channel still shows up in the about
window and about:version of official builds
Review URL: http://codereview.chromium.org/2791001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 70a415d..faede25 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -391,14 +391,15 @@ { # Modify the Info.plist as needed. The script explains why # this is needed. This is also done in the chrome target. - # The framework needs the Breakpad and Keystone keys if - # those features are enabled. It doesn't currently use the - # Subversion keys for anything, but this seems like a really - # good place to store them. + # The framework needs the Breakpad keys if this feature is + # enabled. It does not need the Keystone keys; these always + # come from the outer application bundle. The framework + # doesn't currently use the Subversion keys for anything, + # but this seems like a really good place to store them. 'postbuild_name': 'Tweak Info.plist', 'action': ['<(tweak_info_plist_path)', '-b<(mac_breakpad)', - '-k<(mac_keystone)', + '-k0', '-s1', '<(branding)', '<(mac_bundle_id)'], |