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

Side by Side Diff: third_party/jsoncpp/jsoncpp_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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 | « third_party/boringssl/boringssl_nacl.gyp ('k') | third_party/libevent/libevent_nacl_nonsfi.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'includes': [ 6 'includes': [
7 '../../build/common_untrusted.gypi', 7 '../../build/common_untrusted.gypi',
8 'jsoncpp.gypi', 8 'jsoncpp.gypi',
9 ], 9 ],
10 'conditions': [ 10 'conditions': [
11 ['disable_nacl==0 and disable_nacl_untrusted==0', { 11 ['disable_nacl==0 and disable_nacl_untrusted==0', {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'jsoncpp_nacl', 14 'target_name': 'jsoncpp_nacl',
15 'type': 'none', 15 'type': 'none',
16 'variables': { 16 'variables': {
17 'nacl_untrusted_build': 1, 17 'nacl_untrusted_build': 1,
18 'nlib_target': 'libjsoncpp_nacl.a', 18 'nlib_target': 'libjsoncpp_nacl.a',
19 'build_newlib': 1, 19 'build_newlib': 1,
20 }, 20 },
21 'gcc_compile_flags': [ 21 'gcc_compile_flags': [
22 # Turn off optimizations based on strict aliasing 22 # Turn off optimizations based on strict aliasing
23 # because of the workaround at 23 # because of the workaround at
24 # overrides/src/lib_json/json_value.cpp:38. 24 # overrides/src/lib_json/json_value.cpp:38.
25 '-fno-strict-aliasing', 25 '-fno-strict-aliasing',
26 ], 26 ],
27 'dependencies': [
28 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
29 ],
30 }, 27 },
31 ], 28 ],
32 }], 29 }],
33 ], 30 ],
34 } 31 }
OLDNEW
« no previous file with comments | « third_party/boringssl/boringssl_nacl.gyp ('k') | third_party/libevent/libevent_nacl_nonsfi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698