commit e6b37cf8f779d29d05f9688d6a6c48040c661281
author Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:19 2020 -0700
committer Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:34:19 2020 -0700
tree fb060e34ad822af33cd976d91e061512cb838e13
parent caad50e8481d946e3eae0f12f9c7a025b65781b9

Support building all variants.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 14e8126..b0c553f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,6 @@
 // This file is generated by cargo2android.py.
 
-rust_library_host_rlib {
+rust_library_host {
     name: "libregex",
     crate_name: "regex",
     srcs: ["src/lib.rs"],
@@ -25,7 +25,7 @@
         "unicode-script",
         "unicode-segment",
     ],
-    rlibs: [
+    rustlibs: [
         "libaho_corasick",
         "libmemchr",
         "libregex_syntax",