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

Side by Side Diff: base/base_untrusted.gyp

Issue 10565012: Revert 142482 - Add untrusted NaCl build for PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « base/base.gypi ('k') | base/rand_util_nacl.cc » ('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) 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 '../native_client/build/untrusted.gypi', 10 '../native_client/build/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_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': 0, 23 'build_glibc': 0,
24 'build_newlib': 1, 24 'build_newlib': 1,
25 'sources': [ 25 'sources': [
26 'atomicops_internals_x86_gcc.cc', 26 'atomicops_internals_x86_gcc.cc',
27 'string16.cc', 27 'string16.cc',
28 'sync_socket_nacl.cc', 28 'sync_socket_nacl.cc',
29 'third_party/nspr/prtime.cc', 29 'third_party/nspr/prtime.cc',
30 'time_posix.cc', 30 'time_posix.cc',
31 ], 31 ],
32 }, 32 },
33 'dependencies': [ 33 'dependencies': [
34 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 34 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
35 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li b',
36 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib' ,
35 ], 37 ],
36 }, 38 },
37 ], 39 ],
38 }], 40 }],
39 ], 41 ],
40 } 42 }
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | base/rand_util_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698