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

Side by Side Diff: chrome/chrome.isolate

Issue 724323002: Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | chrome/chrome_tests.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 'files': [ 8 'files': [
9 '<(PRODUCT_DIR)/libffmpegsumo.so', 9 '<(PRODUCT_DIR)/libffmpegsumo.so',
10 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
11 ], 11 ],
12 }, 12 },
13 }], 13 }],
14 ['disable_nacl==0 and OS=="linux"', { 14 ['disable_nacl==0 and OS=="linux"', {
15 'variables': { 15 'variables': {
16 'files': [ 16 'files': [
17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
19 ] 19 ]
20 } 20 }
21 }], 21 }],
22 # TODO(hidehiko,mazda): Include nacl_helper_nonsfi for ARM when supported.
23 ['disable_nacl==0 and OS=="linux" and '
24 '(target_arch=="x64" or target_arch=="ia32")', {
25 'variables': {
26 'files': [
27 '<(PRODUCT_DIR)/nacl_helper_nonsfi<(EXECUTABLE_SUFFIX)',
28 ]
29 }
30 }],
22 ['OS=="linux" or OS=="mac" or OS=="win"', { 31 ['OS=="linux" or OS=="mac" or OS=="win"', {
23 'variables': { 32 'variables': {
24 'files': [ 33 'files': [
25 '<(PRODUCT_DIR)/resources.pak', 34 '<(PRODUCT_DIR)/resources.pak',
26 ], 35 ],
27 }, 36 },
28 }], 37 }],
29 ['OS=="linux" or OS=="win"', { 38 ['OS=="linux" or OS=="win"', {
30 'variables': { 39 'variables': {
31 'command': [ 40 'command': [
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 '<(PRODUCT_DIR)/chrome_child.dll', 112 '<(PRODUCT_DIR)/chrome_child.dll',
104 ], 113 ],
105 }, 114 },
106 }], 115 }],
107 ], 116 ],
108 'includes': [ 117 'includes': [
109 'angle.isolate', 118 'angle.isolate',
110 '../gin/v8.isolate', 119 '../gin/v8.isolate',
111 ], 120 ],
112 } 121 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698