commit 07b3f1506949bac6ae8db4e908ccfa1e4f115efc
author Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:06 2020 -0700
committer Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:06 2020 -0700
tree 8c2ed8c6e37060f193e1ffdd4e7bcd0e6c50b7a1
parent cfc3a2393e88971337346fd696518e9ea60aa2b8

Support building all variants.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index e5bd1fa..640eea3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,6 @@
 // This file is generated by cargo2android.py --run --dependencies --features=bytes.
 
-rust_library_host_rlib {
+rust_library_host {
     name: "libprotobuf",
     crate_name: "protobuf",
     srcs: ["src/lib.rs"],
@@ -8,7 +8,7 @@
     features: [
         "bytes",
     ],
-    rlibs: [
+    rustlibs: [
         "libbytes",
     ],
 }