diff options
| author | dominickn <dominickn@chromium.org> | 2015-12-01 20:56:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-02 04:57:41 +0000 |
| commit | d7f8dad941a8d06f1f53d0e285c1f2d9af28a8fe (patch) | |
| tree | 0791745e4be71da4acd10da74e6b17c9e0325b45 /chrome/browser/apps | |
| parent | 5ea08518de62857b227345f8b5ed267cb7df03e8 (diff) | |
| download | chromium_src-d7f8dad941a8d06f1f53d0e285c1f2d9af28a8fe.zip chromium_src-d7f8dad941a8d06f1f53d0e285c1f2d9af28a8fe.tar.gz chromium_src-d7f8dad941a8d06f1f53d0e285c1f2d9af28a8fe.tar.bz2 | |
[Mac] Increment app shortcut version numbers.
https://crrev.com/1413863003 statically links libc++.a on Mac. This
causes app shims created before the static linking to fail to launch on
Chromium built after the static linking. The launch failures are caused
by substantial memory corruptions in the app_mode::ChromeAppModeInfo
struct when it is passed from the shim launcher to the Chromium dylib at
startup, as the shim is linking against the system C++ library while
Chromium is now linked to its own libc++.
This CL increments the shortcut version numbers, which will cause
Chromium to rebuild shims when it is launched. However, shims which are
launched without Chromium running will continue to fail until Chromium
is launched, at which point the shims will be rebuilt. To counter this,
the ChromeAppModeStart entry point for shims is now versioned; by
incrementing the function version number, all old shims will
automatically be rebuilt on their next launch.
BUG=561205
Review URL: https://codereview.chromium.org/1487503002
Cr-Commit-Position: refs/heads/master@{#362634}
Diffstat (limited to 'chrome/browser/apps')
| -rw-r--r-- | chrome/browser/apps/shortcut_manager.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc index a82467c..412b6c8 100644 --- a/chrome/browser/apps/shortcut_manager.cc +++ b/chrome/browser/apps/shortcut_manager.cc @@ -37,9 +37,7 @@ namespace { // need to be recreated. This might happen when we change various aspects of app // shortcuts like command-line flags or associated icons, binaries, etc. #if defined(OS_MACOSX) -// This was changed to 3 at r316520, but reverted again. Next time we need to -// trigger a recreate, increment this to 4. -const int kCurrentAppShortcutsVersion = 2; +const int kCurrentAppShortcutsVersion = 4; #else const int kCurrentAppShortcutsVersion = 0; #endif |