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

Unified Diff: third_party/protobuf/README.chromium

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Created 4 years, 1 month 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
Index: third_party/protobuf/README.chromium
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
index 8838fbc2715f88ba266247fb32e58147b04ad0a0..318b65eb6ff9a1135c7b186fde1fe13c92847018 100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -3,14 +3,13 @@ Short Name: protobuf
URL: https://github.com/google/protobuf
License: BSD
License File: LICENSE
-Version: 3.0.0-beta-3
-Revision: 3470b6895aa659b7559ed678e029a5338e535f14
+Version: (intermediate version)
Peter Kasting 2016/11/10 20:42:04 Should be 3.1.0 (basically, use whatever is in pro
jbriance 2016/11/10 21:36:54 Ok, I'll update the change.
+Revision: ce5160b83b03c29fd27fc9f58370092b321bf2bc
Security Critical: yes
Steps used to create the current version:
1. Pull the release from https://github.com/google/protobuf/releases
-2. Add build files (BUILD.gn, proto_library.gni, protobuf.gyp,
- protobuf_lite.gypi, protobuf_nacl.gyp).
+2. Add build files (BUILD.gn, proto_library.gni).
Be sure to update the list of source files, as additional .cc files and
headers might have been added -- you need to find the transitive closure of
@@ -55,13 +54,6 @@ Description of the patches:
protobuf symbols in Linux .so libraries, so that protobuf can be built as a
component (see http://crrev.com/179806).
-- 0005-fix-include-js-generator.protobuf
-
- During merge with internal branch, the <> in one of the #includes were
- accidentally replaced with "", which results in a failure in checkdeps.
-
- Fixed in https://github.com/google/protobuf/pull/1547.
-
- 0007-uninline_googleonce.patch
- 0008-uninline_get_empty_string.patch
- 0009-uninline-arenastring.patch
@@ -69,10 +61,3 @@ Description of the patches:
These patches uninline some functions, resulting in a significant reduction
(somewhere between 500 KB and 1 MB) of binary size.
-
-- 0011-libprotobuf_export.patch
-
- During merge with internal branch, the dll export attribute was accidentally
- removed in C++11 mode.
-
- Fixed in https://github.com/google/protobuf/pull/1549

Powered by Google App Engine
This is Rietveld 408576698