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

Side by Side Diff: chrome/chrome.isolate

Issue 584553006: Don't include nacl_irt_x86_64.nexe in isolate for 32 bit Linux builds which don't have it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« 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)/libffmpegsumo.so', 9 '<(PRODUCT_DIR)/libffmpegsumo.so',
10 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
(...skipping 12 matching lines...) Expand all
23 ['OS=="linux" or OS=="win"', { 23 ['OS=="linux" or OS=="win"', {
24 'variables': { 24 'variables': {
25 'command': [ 25 'command': [
26 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', 26 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
27 ], 27 ],
28 'isolate_dependency_tracked': [ 28 'isolate_dependency_tracked': [
29 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', 29 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
30 '<(PRODUCT_DIR)/chrome_100_percent.pak', 30 '<(PRODUCT_DIR)/chrome_100_percent.pak',
31 '<(PRODUCT_DIR)/locales/en-US.pak', 31 '<(PRODUCT_DIR)/locales/en-US.pak',
32 '<(PRODUCT_DIR)/locales/fr.pak', 32 '<(PRODUCT_DIR)/locales/fr.pak',
33 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
34 ], 33 ],
35 'isolate_dependency_untracked': [ 34 'isolate_dependency_untracked': [
36 '<(PRODUCT_DIR)/resources/extension/', 35 '<(PRODUCT_DIR)/resources/extension/',
37 ], 36 ],
38 }, 37 },
39 }], 38 }],
39 ['OS=="win" or (OS=="linux" and target_arch=="x64"', {
Dan Beam 2014/09/18 20:44:46 doesn't this need a closing )?
jam 2014/09/18 20:45:19 yep had put it right after I sent it :)
40 'variables': {
41 'isolate_dependency_tracked': [
42 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
43 ],
44 },
45 }],
40 ['OS=="mac"', { 46 ['OS=="mac"', {
41 'variables': { 47 'variables': {
42 'command': [ 48 'command': [
43 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)', 49 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)',
44 ], 50 ],
45 'isolate_dependency_tracked': [ 51 'isolate_dependency_tracked': [
46 '<(PRODUCT_DIR)/exif.so', 52 '<(PRODUCT_DIR)/exif.so',
47 '<(PRODUCT_DIR)/ffmpegsumo.so', 53 '<(PRODUCT_DIR)/ffmpegsumo.so',
48 ], 54 ],
49 'isolate_dependency_untracked': [ 55 'isolate_dependency_untracked': [
(...skipping 27 matching lines...) Expand all
77 'isolate_dependency_tracked': [ 83 'isolate_dependency_tracked': [
78 '<(PRODUCT_DIR)/chrome_child.dll', 84 '<(PRODUCT_DIR)/chrome_child.dll',
79 ], 85 ],
80 }, 86 },
81 }], 87 }],
82 ], 88 ],
83 'includes': [ 89 'includes': [
84 'angle.isolate', 90 'angle.isolate',
85 ], 91 ],
86 } 92 }
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