diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 00:55:14 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-20 00:55:14 +0000 |
| commit | 1c1849c95975ae07d98fa0fdee857c90cb9c3fa2 (patch) | |
| tree | ce794f8cd7cf1c557a6276ed24af4028187fd568 /chrome/chrome.isolate | |
| parent | 8e84e8ba62a62ecec0d2b2ab389e5de5d7c3e30e (diff) | |
| download | chromium_src-1c1849c95975ae07d98fa0fdee857c90cb9c3fa2.zip chromium_src-1c1849c95975ae07d98fa0fdee857c90cb9c3fa2.tar.gz chromium_src-1c1849c95975ae07d98fa0fdee857c90cb9c3fa2.tar.bz2 | |
Fix archiving and running Chromium.app on OSX with target chrome_run.
All the necessary files, like resources.pak and ffmpegsumo.so, are already
mapping deep inside Chromium.app/. Mapping the ones in PRODUCT_DIR is useless.
Technically, Chromium.dmg could be used but it's harder to start from the
command line, and mapping each individual files permits caching modules that
haven't changed, like the resource files.
TBR=csharp@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/14109022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index a11b7cd..86233c4 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -17,13 +17,6 @@ ], }, }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/resources.pak', - ], - }, - }], ['OS=="linux" or OS=="win"', { 'variables': { 'command': [ @@ -35,6 +28,7 @@ '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + '<(PRODUCT_DIR)/resources.pak', ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/lib64/', @@ -45,8 +39,8 @@ }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', + 'command': [ + '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium', ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/Chromium Framework.framework/', |