commit eb50abb49786dae3ce91cc3d16646737147c18a7
author Andrew Walbran <qwandor@google.com> Tue Jun 09 15:18:06 2020 +0100
committer Andrew Walbran <qwandor@google.com> Mon Jun 15 16:07:42 2020 +0100
tree 24c395e8d37c85ca3edb894c0e2378941570a59a
parent 8732ec5c287ef17eb84199413162bdaa436af39b

Allow building for device.

Ran 'cargo2android.py --run --device --test'.

Bug: 158290206
Test: atest -c -m --include-subdirs .
Change-Id: I03ab7655d85d2f7641822a4cb0f997f2ffaf0884

Android.bp

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

TEST_MAPPING

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