commit c4e85f2c6bb3b117fb3f299f92008b689ae78810
author Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:13 2020 -0700
committer Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:13 2020 -0700
tree 762167642baf7f04da611674ec2853b7a6f31fed
parent 92ff6050970bae060821744b82e30198268dd981

Support building all variants.

Bug: 143217452
Test: cd external/rust; mma; atest in all TEST_MAPPING subdirs
Change-Id: I655594c69ba9477b39540d79bac5a04cb4d27095

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",
     ],