Allow building for device.
Ran 'cargo2android.py --run --device --test'.
Bug: 158290206
Test: atest -c -m --include-subdirs .
Change-Id: I9452e9152dfe127622b6c073a891e24d96baba1a
diff --git a/Android.bp b/Android.bp
index 0d02f18..4259231 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,8 @@
-// This file is generated by cargo2android.py.
+// This file is generated by cargo2android.py --run --device --test.
-rust_library_host_rlib {
+rust_library_rlib {
name: "libpin_utils",
+ host_supported: true,
crate_name: "pin_utils",
srcs: ["src/lib.rs"],
edition: "2018",
@@ -9,6 +10,7 @@
rust_defaults {
name: "pin-utils_tests",
+ host_supported: true,
crate_name: "pin_utils",
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -18,7 +20,7 @@
],
}
-rust_test_host {
+rust_test {
name: "pin-utils_tests_stack_pin",
defaults: ["pin-utils_tests"],
srcs: [
@@ -26,7 +28,7 @@
],
}
-rust_test_host {
+rust_test {
name: "pin-utils_tests_projection",
defaults: ["pin-utils_tests"],
srcs: [
@@ -34,8 +36,9 @@
],
}
-rust_test_host {
+rust_test {
name: "pin-utils_tests_pin_utils",
+ host_supported: true,
crate_name: "pin_utils",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e1d5159..a30a86c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,14 +1,23 @@
{
"presubmit": [
{
+ "name": "pin-utils_tests_projection"
+ },
+ {
"name": "pin-utils_tests_projection",
"host": true
},
{
+ "name": "pin-utils_tests_stack_pin"
+ },
+ {
"name": "pin-utils_tests_stack_pin",
"host": true
},
{
+ "name": "pin-utils_tests_pin_utils"
+ },
+ {
"name": "pin-utils_tests_pin_utils",
"host": true
}
