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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/protobuf_lite.gypi ('k') | third_party/protobuf/protoc-artifacts/Dockerfile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/protobuf_nacl.gyp
diff --git a/third_party/protobuf/protobuf_nacl.gyp b/third_party/protobuf/protobuf_nacl.gyp
index ae37f2f01502d0d699357c10bf1dd1c235d6a69f..4b63e5c10a9202f71a7701cfb88f1b056f3ecd8c 100644
--- a/third_party/protobuf/protobuf_nacl.gyp
+++ b/third_party/protobuf/protobuf_nacl.gyp
@@ -11,23 +11,15 @@
'target_name': 'protobuf_lite_nacl',
'type': 'none',
'variables': {
+ 'nacl_untrusted_build': 1,
'nlib_target': 'libprotobuf_lite_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_pnacl_newlib': 1,
- 'config_h_dir': '.',
},
- 'pnacl_compile_flags': [
- # This disables #warning in hash_map/hash_set headers which are
- # deprecated but still used in protobuf.
- #
- # TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set
- # and remove this flag.
- '-Wno-#warnings',
- ],
'includes': [
'protobuf_lite.gypi',
],
- }, # end of target 'protobuf_lite_nacl'
+ },
]
}
« 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