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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/protobuf_nacl.gyp

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« third_party/protobuf/descriptor_pb2.py ('K') | « 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..c2a72c49ce2e21f75ea9c07863c01ba5b7667a36 100644
--- a/third_party/protobuf/protobuf_nacl.gyp
+++ b/third_party/protobuf/protobuf_nacl.gyp
@@ -15,7 +15,6 @@
'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
@@ -24,6 +23,7 @@
# TODO(sergeyu): Migrate protobuf to unordered_man and unordered_set
# and remove this flag.
'-Wno-#warnings',
+ '-DHAVE_PTHREAD',
],
'includes': [
'protobuf_lite.gypi',
« third_party/protobuf/descriptor_pb2.py ('K') | « 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