Upgrade rust/crates/protobuf-codegen to 2.25.0android-s-beta-5android-s-beta-5

Test: make
Change-Id: If56f70d9feb629f270c48267bd5a7ac80e26f885

7 files changed, 18 insertions, 19 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index ce434ce..1911953 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "6a1143f708c31fa16253a015c334fc6e9b001013"
+    "sha1": "645d02b122c3c19309d1c56dee7f771829e36d76"
   }
 }
diff --git a/Android.bp b/Android.bp
index 83450a7..a6b18de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,4 +57,4 @@ rust_binary_host {
 }
 
 // dependent_library ["feature_list"]
-//   protobuf-2.24.1
+//   protobuf-2.25.0
diff --git a/Cargo.lock b/Cargo.lock
index 1b090b5..6931493 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,13 +4,13 @@ version = 3
 
 [[package]]
 name = "protobuf"
-version = "2.24.1"
+version = "2.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db50e77ae196458ccd3dc58a31ea1a90b0698ab1b7928d89f644c25d72070267"
+checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b"
 
 [[package]]
 name = "protobuf-codegen"
-version = "2.24.1"
+version = "2.25.0"
 dependencies = [
  "protobuf",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 4ed67d4..7de1119 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
 name = "protobuf-codegen"
-version = "2.24.1"
+version = "2.25.0"
 authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"]
 description = "Code generator for rust-protobuf.\n\nIncludes a library and `protoc-gen-rust` binary.\n\nSee `protoc-rust` and `protobuf-codegen-pure` crates.\n"
 homepage = "https://github.com/stepancheg/rust-protobuf/"
@@ -34,4 +33,4 @@ name = "protobuf-bin-gen-rust-do-not-use"
 path = "src/bin/protobuf-bin-gen-rust-do-not-use.rs"
 test = false
 [dependencies.protobuf]
-version = "=2.24.1"
+version = "=2.25.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 347fb1c..08df3a1 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "protobuf-codegen"
-version = "2.24.1"
+version = "2.25.0"
 authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"]
 license = "MIT"
 homepage = "https://github.com/stepancheg/rust-protobuf/"
@@ -17,7 +17,7 @@ See `protoc-rust` and `protobuf-codegen-pure` crates.
 bench = false
 
 [dependencies]
-protobuf = { path = "../protobuf", version = "=2.24.1" }
+protobuf = { path = "../protobuf", version = "=2.25.0" }
 
 [[bin]]
 
diff --git a/METADATA b/METADATA
index 766f834..c0f176f 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.24.1.crate"
+    value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.25.0.crate"
   }
-  version: "2.24.1"
+  version: "2.25.0"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 6
-    day: 21
+    month: 8
+    day: 9
   }
 }
diff --git a/src/lib.rs b/src/lib.rs
index f1ff0aa..c8e0b5d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -192,7 +192,7 @@ fn gen_file(
     {
         let mut w = CodeWriter::new(&mut v);
 
-        w.write_generated_by("rust-protobuf", "2.24.1");
+        w.write_generated_by("rust-protobuf", "2.25.0");
         w.write_line(&format!("//! Generated file from `{}`", file.get_name()));
         if customize.inside_protobuf != Some(true) {
             w.write_line("");