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

Side by Side Diff: chrome/chrome.isolate

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove duplicate Created 6 years, 9 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
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',
11 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 11 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
12 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 12 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
13 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 13 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
14 ], 14 ],
15 }, 15 },
16 }], 16 }],
17 ['OS=="linux" and use_mojo==1', {
18 'variables': {
19 'isolate_dependency_tracked': [
20 '<(PRODUCT_DIR)/lib/libmojo_system.so',
21 ],
22 },
23 }],
17 ['OS=="linux" or OS=="mac" or OS=="win"', { 24 ['OS=="linux" or OS=="mac" or OS=="win"', {
18 'variables': { 25 'variables': {
19 'isolate_dependency_tracked': [ 26 'isolate_dependency_tracked': [
20 '<(PRODUCT_DIR)/resources.pak', 27 '<(PRODUCT_DIR)/resources.pak',
21 ], 28 ],
22 }, 29 },
23 }], 30 }],
24 ['OS=="linux" or OS=="win"', { 31 ['OS=="linux" or OS=="win"', {
25 'variables': { 32 'variables': {
26 'command': [ 33 'command': [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 '<(PRODUCT_DIR)/osmesa.dll', 76 '<(PRODUCT_DIR)/osmesa.dll',
70 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 77 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
71 ], 78 ],
72 }, 79 },
73 }], 80 }],
74 ], 81 ],
75 'includes': [ 82 'includes': [
76 '../third_party/icu/icu.isolate', 83 '../third_party/icu/icu.isolate',
77 ], 84 ],
78 } 85 }
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698