commit 68718733e6990d1a4e9624641ccb9d1ac96fc38f
author Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:20:29 2020 -0700
committer Matthew Maurer <mmaurer@google.com> Mon Jul 06 13:20:29 2020 -0700
tree e15b43c8354d62c8516579b81830f62ffd602587
parent 8c390197cea9dd7885d0c29ddcc41f4a878643ea

Support building all variants.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index bc56973..24754af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,6 @@
 // This file is generated by cargo2android.py --run --device --features channel,default,io,memchr,sink.
 
-rust_library_rlib {
+rust_library {
     name: "libfutures_util",
     host_supported: true,
     crate_name: "futures_util",
@@ -24,7 +24,7 @@
         "slab",
         "std",
     ],
-    rlibs: [
+    rustlibs: [
         "libfutures_channel",
         "libfutures_core",
         "libfutures_io",