Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1560)

Side by Side Diff: chrome/chrome.isolate

Issue 13956022: Fix chrome_run to work well on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'isolate_dependency_tracked': [ 8 'isolate_dependency_tracked': [
9 '<(PRODUCT_DIR)/chrome.pak', 9 '<(PRODUCT_DIR)/chrome.pak',
10 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
11 '<(PRODUCT_DIR)/libclearkeycdm.so', 10 '<(PRODUCT_DIR)/libclearkeycdm.so',
12 '<(PRODUCT_DIR)/libclearkeycdmadapter.so', 11 '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
13 '<(PRODUCT_DIR)/libffmpegsumo.so', 12 '<(PRODUCT_DIR)/libffmpegsumo.so',
14 '<(PRODUCT_DIR)/libosmesa.so', 13 '<(PRODUCT_DIR)/libosmesa.so',
15 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 14 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
16 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 15 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
17 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 16 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
18 ], 17 ],
19 }, 18 },
20 }], 19 }],
21 ['OS=="linux" or OS=="mac" or OS=="win"', { 20 ['OS=="linux" or OS=="mac" or OS=="win"', {
22 'variables': { 21 'variables': {
23 'isolate_dependency_tracked': [ 22 'isolate_dependency_tracked': [
24 '<(PRODUCT_DIR)/resources.pak', 23 '<(PRODUCT_DIR)/resources.pak',
25 ], 24 ],
26 }, 25 },
27 }], 26 }],
28 ['OS=="linux" or OS=="win"', { 27 ['OS=="linux" or OS=="win"', {
29 'variables': { 28 'variables': {
29 'command': [
30 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
31 ],
30 'isolate_dependency_tracked': [ 32 'isolate_dependency_tracked': [
33 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
31 '<(PRODUCT_DIR)/chrome_100_percent.pak', 34 '<(PRODUCT_DIR)/chrome_100_percent.pak',
32 '<(PRODUCT_DIR)/locales/en-US.pak', 35 '<(PRODUCT_DIR)/locales/en-US.pak',
33 '<(PRODUCT_DIR)/locales/fr.pak', 36 '<(PRODUCT_DIR)/locales/fr.pak',
34 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 37 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
35 ], 38 ],
36 'isolate_dependency_untracked': [ 39 'isolate_dependency_untracked': [
37 '<(PRODUCT_DIR)/lib64/', 40 '<(PRODUCT_DIR)/lib64/',
38 '<(PRODUCT_DIR)/plugins/', 41 '<(PRODUCT_DIR)/plugins/',
39 '<(PRODUCT_DIR)/resources/extension/', 42 '<(PRODUCT_DIR)/resources/extension/',
40 ], 43 ],
41 }, 44 },
42 }], 45 }],
43 ['OS=="mac"', { 46 ['OS=="mac"', {
44 'variables': { 47 'variables': {
45 'isolate_dependency_tracked': [ 48 'isolate_dependency_tracked': [
46 '<(PRODUCT_DIR)/ffmpegsumo.so', 49 '<(PRODUCT_DIR)/ffmpegsumo.so',
47 ], 50 ],
48 'isolate_dependency_untracked': [ 51 'isolate_dependency_untracked': [
49 '<(PRODUCT_DIR)/Chromium Framework.framework/', 52 '<(PRODUCT_DIR)/Chromium Framework.framework/',
50 '<(PRODUCT_DIR)/Chromium.app/', 53 '<(PRODUCT_DIR)/Chromium.app/',
51 ], 54 ],
52 }, 55 },
53 }], 56 }],
54 ['OS=="win"', { 57 ['OS=="win"', {
55 'variables': { 58 'variables': {
56 'isolate_dependency_tracked': [ 59 'isolate_dependency_tracked': [
57 '<(PRODUCT_DIR)/D3DCompiler_43.dll', 60 '<(PRODUCT_DIR)/D3DCompiler_43.dll',
61 '<(PRODUCT_DIR)/chrome.dll',
58 '<(PRODUCT_DIR)/clearkeycdm.dll', 62 '<(PRODUCT_DIR)/clearkeycdm.dll',
59 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', 63 '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
60 '<(PRODUCT_DIR)/d3dcompiler_46.dll', 64 '<(PRODUCT_DIR)/d3dcompiler_46.dll',
61 '<(PRODUCT_DIR)/ffmpegsumo.dll', 65 '<(PRODUCT_DIR)/ffmpegsumo.dll',
62 '<(PRODUCT_DIR)/icudt.dll', 66 '<(PRODUCT_DIR)/icudt.dll',
63 '<(PRODUCT_DIR)/libEGL.dll', 67 '<(PRODUCT_DIR)/libEGL.dll',
64 '<(PRODUCT_DIR)/libGLESv2.dll', 68 '<(PRODUCT_DIR)/libGLESv2.dll',
65 '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', 69 '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
66 '<(PRODUCT_DIR)/osmesa.dll', 70 '<(PRODUCT_DIR)/osmesa.dll',
67 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 71 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
68 ], 72 ],
69 }, 73 },
70 }], 74 }],
71 ], 75 ],
72 } 76 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698