summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 18:38:28 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 18:38:28 +0000
commit54b09939492d775363209a4bde76f5f16359eafc (patch)
tree74a7d7671cd2c1289fef64295cc3f886da14d8b9 /chrome
parentab5c42b002a425649c3448096c95f5bbbc40e2dc (diff)
downloadchromium_src-54b09939492d775363209a4bde76f5f16359eafc.zip
chromium_src-54b09939492d775363209a4bde76f5f16359eafc.tar.gz
chromium_src-54b09939492d775363209a4bde76f5f16359eafc.tar.bz2
Fix chrome_run to work well on Windows.
Add 'command' on linux too. OSX will come next. TBR=csharp@chromium.org BUG= NOTRY=true Review URL: https://chromiumcodereview.appspot.com/13956022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.isolate6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 6406348..a11b7cd 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -7,7 +7,6 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/chrome.pak',
- '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libclearkeycdm.so',
'<(PRODUCT_DIR)/libclearkeycdmadapter.so',
'<(PRODUCT_DIR)/libffmpegsumo.so',
@@ -27,7 +26,11 @@
}],
['OS=="linux" or OS=="win"', {
'variables': {
+ 'command': [
+ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
+ ],
'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
'<(PRODUCT_DIR)/locales/fr.pak',
@@ -55,6 +58,7 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/D3DCompiler_43.dll',
+ '<(PRODUCT_DIR)/chrome.dll',
'<(PRODUCT_DIR)/clearkeycdm.dll',
'<(PRODUCT_DIR)/clearkeycdmadapter.dll',
'<(PRODUCT_DIR)/d3dcompiler_46.dll',