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

Side by Side Diff: chrome/chrome.isolate

Issue 687173002: Fix build with disable_nacl=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated 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 | « chrome/browser_tests.isolate ('k') | 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 'files': [ 8 'files': [
9 '<(PRODUCT_DIR)/libffmpegsumo.so', 9 '<(PRODUCT_DIR)/libffmpegsumo.so',
10 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
11 ],
12 },
13 }],
14 ['disable_nacl==0 and OS=="linux"', {
15 'variables': {
16 'files': [
11 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
12 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
13 ], 19 ]
14 }, 20 }
15 }], 21 }],
16 ['OS=="linux" or OS=="mac" or OS=="win"', { 22 ['OS=="linux" or OS=="mac" or OS=="win"', {
17 'variables': { 23 'variables': {
18 'files': [ 24 'files': [
19 '<(PRODUCT_DIR)/resources.pak', 25 '<(PRODUCT_DIR)/resources.pak',
20 ], 26 ],
21 }, 27 },
22 }], 28 }],
23 ['OS=="linux" or OS=="win"', { 29 ['OS=="linux" or OS=="win"', {
24 'variables': { 30 'variables': {
25 'command': [ 31 'command': [
26 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', 32 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
27 ], 33 ],
28 'files': [ 34 'files': [
29 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', 35 '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
30 '<(PRODUCT_DIR)/chrome_100_percent.pak', 36 '<(PRODUCT_DIR)/chrome_100_percent.pak',
31 '<(PRODUCT_DIR)/locales/en-US.pak', 37 '<(PRODUCT_DIR)/locales/en-US.pak',
32 '<(PRODUCT_DIR)/locales/fr.pak', 38 '<(PRODUCT_DIR)/locales/fr.pak',
33 '<(PRODUCT_DIR)/resources/extension/', 39 '<(PRODUCT_DIR)/resources/extension/',
34 ], 40 ],
35 }, 41 },
36 }], 42 }],
37 ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 43 ['disable_nacl==0 and '
44 '(OS=="win" or (OS=="linux" and target_arch=="x64"))', {
38 'variables': { 45 'variables': {
39 'files': [ 46 'files': [
40 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 47 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
41 ], 48 ],
42 }, 49 },
43 }], 50 }],
44 ['OS=="linux" and target_arch=="arm"', { 51 ['disable_nacl==0 and OS=="linux" and target_arch=="arm"', {
45 'variables': { 52 'variables': {
46 'files': [ 53 'files': [
47 '<(PRODUCT_DIR)/nacl_irt_arm.nexe', 54 '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
48 ], 55 ],
49 }, 56 },
50 }], 57 }],
51 ['OS=="mac"', { 58 ['OS=="mac"', {
52 'variables': { 59 'variables': {
53 'command': [ 60 'command': [
54 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)', 61 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)',
(...skipping 16 matching lines...) Expand all
71 '<(PRODUCT_DIR)/chrome_elf.dll', 78 '<(PRODUCT_DIR)/chrome_elf.dll',
72 '<(PRODUCT_DIR)/ffmpegsumo.dll', 79 '<(PRODUCT_DIR)/ffmpegsumo.dll',
73 '<(PRODUCT_DIR)/libexif.dll', 80 '<(PRODUCT_DIR)/libexif.dll',
74 '<(PRODUCT_DIR)/osmesa.dll', 81 '<(PRODUCT_DIR)/osmesa.dll',
75 ], 82 ],
76 }, 83 },
77 }], 84 }],
78 ['OS=="win" and target_arch=="ia32"', { 85 ['OS=="win" and target_arch=="ia32"', {
79 'variables': { 86 'variables': {
80 'files': [ 87 'files': [
88 '<(PRODUCT_DIR)/wow_helper.exe',
89 ],
90 },
91 }],
92 ['disable_nacl==0 and OS=="win" and target_arch=="ia32"', {
93 'variables': {
94 'files': [
81 '<(PRODUCT_DIR)/nacl64.exe', 95 '<(PRODUCT_DIR)/nacl64.exe',
82 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 96 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
83 '<(PRODUCT_DIR)/wow_helper.exe',
84 ], 97 ],
85 }, 98 },
86 }], 99 }],
87 ['OS=="win" and component=="static_library"', { 100 ['OS=="win" and component=="static_library"', {
88 'variables': { 101 'variables': {
89 'files': [ 102 'files': [
90 '<(PRODUCT_DIR)/chrome_child.dll', 103 '<(PRODUCT_DIR)/chrome_child.dll',
91 ], 104 ],
92 }, 105 },
93 }], 106 }],
94 ], 107 ],
95 'includes': [ 108 'includes': [
96 'angle.isolate', 109 'angle.isolate',
97 ], 110 ],
98 } 111 }
OLDNEW
« no previous file with comments | « chrome/browser_tests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698