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

Side by Side Diff: base/base_untrusted.gyp

Issue 11685002: Linux: add option to use system nspr. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 12 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) 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
11 'base.gypi', 11 'base.gypi',
12 ], 12 ],
13 'conditions': [ 13 'conditions': [
14 ['disable_nacl==0 and disable_nacl_untrusted==0', { 14 ['disable_nacl==0 and disable_nacl_untrusted==0', {
15 'targets': [ 15 'targets': [
16 { 16 {
17 'target_name': 'base_untrusted', 17 'target_name': 'base_untrusted',
18 'type': 'none', 18 'type': 'none',
19 'variables': { 19 'variables': {
20 'base_target': 1, 20 'base_target': 1,
21 'nacl_untrusted_build': 1, 21 'nacl_untrusted_build': 1,
22 'nlib_target': 'libbase_untrusted.a', 22 'nlib_target': 'libbase_untrusted.a',
23 'build_glibc': 1, 23 'build_glibc': 1,
24 'build_newlib': 1, 24 'build_newlib': 1,
25 'sources': [ 25 'sources': [
26 'string16.cc', 26 'string16.cc',
27 'sync_socket_nacl.cc', 27 'sync_socket_nacl.cc',
28 # Note: use bundled nspr files here, because NaCl toolchain
29 # does not look for libraries in system directories.
Ryan Sleevi 2013/01/03 18:51:35 I don't think this comment is entirely accurate, s
Paweł Hajdan Jr. 2013/01/04 18:01:31 It is - I've asked the nacl toolchain for searched
28 'third_party/nspr/prtime.cc', 30 'third_party/nspr/prtime.cc',
29 'time_posix.cc', 31 'time_posix.cc',
30 ], 32 ],
31 }, 33 },
32 'dependencies': [ 34 'dependencies': [
33 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 35 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
34 ], 36 ],
35 }, 37 },
36 ], 38 ],
37 }], 39 }],
38 ], 40 ],
39 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698