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

Side by Side Diff: chrome/nacl.gypi

Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bring nacl_paths back Created 7 years, 6 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 | « chrome/common/nacl_paths.cc ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'include': [ 6 'include': [
7 '../native_client/build/untrusted.gypi', 7 '../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 '<(DEPTH)/third_party/wtl/include', 47 '<(DEPTH)/third_party/wtl/include',
48 ], 48 ],
49 },], 49 },],
50 ['OS=="linux"', { 50 ['OS=="linux"', {
51 'defines': [ 51 'defines': [
52 '__STDC_LIMIT_MACROS=1', 52 '__STDC_LIMIT_MACROS=1',
53 ], 53 ],
54 'sources': [ 54 'sources': [
55 'app/nacl_fork_delegate_linux.cc', 55 'app/nacl_fork_delegate_linux.cc',
56 'app/nacl_fork_delegate_linux.h', 56 'app/nacl_fork_delegate_linux.h',
57 'common/nacl_paths.cc',
58 'common/nacl_paths.h',
57 ], 59 ],
58 },], 60 },],
59 ], 61 ],
60 }], 62 }],
61 ], 63 ],
62 }, 64 },
63 'conditions': [ 65 'conditions': [
64 ['disable_nacl!=1', { 66 ['disable_nacl!=1', {
65 'targets': [ 67 'targets': [
66 { 68 {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 'target_name': 'nacl_win64', 209 'target_name': 'nacl_win64',
208 'type': 'none', 210 'type': 'none',
209 'sources': [], 211 'sources': [],
210 }, 212 },
211 ], 213 ],
212 }], 214 }],
213 ], 215 ],
214 }], 216 }],
215 ], 217 ],
216 } 218 }
OLDNEW
« no previous file with comments | « chrome/common/nacl_paths.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698