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

Side by Side Diff: third_party/protobuf/protobuf_nacl.gyp

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 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
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 'nacl_untrusted_build': 1,
14 'nlib_target': 'libprotobuf_lite_nacl.a', 15 'nlib_target': 'libprotobuf_lite_nacl.a',
15 'build_glibc': 0, 16 'build_glibc': 0,
16 'build_newlib': 0, 17 'build_newlib': 0,
17 'build_pnacl_newlib': 1, 18 'build_pnacl_newlib': 1,
18 'config_h_dir': '.',
19 }, 19 },
20 'pnacl_compile_flags': [
21 # This disables #warning in hash_map/hash_set headers which are
22 # deprecated but still used in protobuf.
23 #
24 # TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set
25 # and remove this flag.
26 '-Wno-#warnings',
27 ],
28 'includes': [ 20 'includes': [
29 'protobuf_lite.gypi', 21 'protobuf_lite.gypi',
30 ], 22 ],
31 }, # end of target 'protobuf_lite_nacl' 23 },
32 ] 24 ]
33 } 25 }
OLDNEW
« no previous file with comments | « third_party/protobuf/protobuf_lite.gypi ('k') | third_party/protobuf/protoc-artifacts/Dockerfile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698