commit fc93b52c9f6a1d8e5f035d8331295a7f39a89046
author Matthew Maurer <mmaurer@google.com> Tue Jul 07 00:50:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 07 00:50:59 2020 +0000
tree 762167642baf7f04da611674ec2853b7a6f31fed
parent 9668738aaec5fd7577fea2fbf48d57236c2107f3
parent 5b863058d65f3f1a39448651cb54902bc1121b9c

Support building all variants. am: c4e85f2c6b am: 5b863058d6

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/1355926

Change-Id: Icc6cf8aefd2d1b1c4b54ceb43e4ab88dcbf57aa0

Android.bp

diff --git a/Android.bp b/Android.bp
index 2d4ef0a..f7cfb49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,12 +2,12 @@
 
 // Rename protoc_gen_rust to protoc-gen-rust for aprotoc plugin.
 
-rust_library_host_rlib {
+rust_library_host {
     name: "libprotobuf_codegen",
     crate_name: "protobuf_codegen",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rlibs: [
+    rustlibs: [
         "libprotobuf",
     ],
 }
@@ -28,7 +28,7 @@
     crate_name: "protoc_gen_rust",
     srcs: ["src/bin/protoc-gen-rust.rs"],
     edition: "2015",
-    rlibs: [
+    rustlibs: [
         "libprotobuf",
         "libprotobuf_codegen",
     ],