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

Side by Side Diff: third_party/protobuf/protobuf_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/opus/opus_nacl.gyp ('k') | third_party/usrsctp/usrsctp_nacl.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 '../../native_client/build/untrusted.gypi', 7 '../../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'protobuf_lite_nacl', 11 'target_name': 'protobuf_lite_nacl',
12 'type': 'none', 12 'type': 'none',
13 'variables': { 13 'variables': {
14 'nlib_target': 'libprotobuf_lite_nacl.a', 14 'nlib_target': 'libprotobuf_lite_nacl.a',
15 'build_glibc': 0, 15 'build_glibc': 0,
16 'build_newlib': 0, 16 'build_newlib': 0,
17 'build_pnacl_newlib': 1, 17 'build_pnacl_newlib': 1,
18 'config_h_dir': '.', 18 'config_h_dir': '.',
19 }, 19 },
20 'dependencies': [
21 '../../native_client/tools.gyp:prep_toolchain',
22 ],
23 'pnacl_compile_flags': [ 20 'pnacl_compile_flags': [
24 # This disables #warning in hash_map/hash_set headers which are 21 # This disables #warning in hash_map/hash_set headers which are
25 # deprecated but still used in protobuf. 22 # deprecated but still used in protobuf.
26 # 23 #
27 # TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set 24 # TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set
28 # and remove this flag. 25 # and remove this flag.
29 '-Wno-#warnings', 26 '-Wno-#warnings',
30 ], 27 ],
31 'includes': [ 28 'includes': [
32 'protobuf_lite.gypi', 29 'protobuf_lite.gypi',
33 ], 30 ],
34 }, # end of target 'protobuf_lite_nacl' 31 }, # end of target 'protobuf_lite_nacl'
35 ] 32 ]
36 } 33 }
OLDNEW
« no previous file with comments | « third_party/opus/opus_nacl.gyp ('k') | third_party/usrsctp/usrsctp_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698