Allow building for device. am: eb50abb497 am: 47a199fdec am: 05685ea734 am: cadd259595

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1333193

Change-Id: I7514ceba5fb0cd5f29eefaf3a39cf04f3dbfb5a5

2 files changed, 13 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index b7ab767..7f627cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,14 +1,16 @@
-// This file is generated by cargo2android.py.
+// This file is generated by cargo2android.py --run --device --tests.
 
-rust_library_host_rlib {
+rust_library_rlib {
     name: "libslab",
+    host_supported: true,
     crate_name: "slab",
     srcs: ["src/lib.rs"],
     edition: "2015",
 }
 
-rust_test_host {
+rust_test {
     name: "slab_tests_slab",
+    host_supported: true,
     crate_name: "slab",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
@@ -16,8 +18,9 @@ rust_test_host {
     edition: "2015",
 }
 
-rust_test_host {
+rust_test {
     name: "slab_tests_slab1",
+    host_supported: true,
     crate_name: "slab",
     srcs: ["tests/slab.rs"],
     test_suites: ["general-tests"],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b1257cb..acd7705 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,8 +5,14 @@
       "host": true
     },
     {
+      "name": "slab_tests_slab"
+    },
+    {
       "name": "slab_tests_slab1",
       "host": true
+    },
+    {
+      "name": "slab_tests_slab1"
     }
   ]
 }