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

Side by Side Diff: trunk/src/chrome/chrome.isolate

Issue 200033005: Revert 258062 "Turns on use_mojo=1 for linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/chrome/chrome_installer.gypi » ('j') | 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',
11 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 11 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
12 '<(PRODUCT_DIR)/lib/libmojo_system.so',
13 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 12 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
14 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 13 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
15 ], 14 ],
16 }, 15 },
17 }], 16 }],
18 ['OS=="linux" or OS=="mac" or OS=="win"', { 17 ['OS=="linux" or OS=="mac" or OS=="win"', {
19 'variables': { 18 'variables': {
20 'isolate_dependency_tracked': [ 19 'isolate_dependency_tracked': [
21 '<(PRODUCT_DIR)/resources.pak', 20 '<(PRODUCT_DIR)/resources.pak',
22 ], 21 ],
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 '<(PRODUCT_DIR)/osmesa.dll', 69 '<(PRODUCT_DIR)/osmesa.dll',
71 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', 70 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
72 ], 71 ],
73 }, 72 },
74 }], 73 }],
75 ], 74 ],
76 'includes': [ 75 'includes': [
77 '../third_party/icu/icu.isolate', 76 '../third_party/icu/icu.isolate',
78 ], 77 ],
79 } 78 }
OLDNEW
« no previous file with comments | « trunk/src/build/common.gypi ('k') | trunk/src/chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698