Merge d72a1c357d7078b2f74ea0f982b8c84fcc1b05fe on remote branch
Change-Id: Id883038b51fc49034b33158244a9a78f8cd37087
diff --git a/Android.bp b/Android.bp
index 4d8ed7e..57a3add 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: [
"external_rust_crates_rustc-demangle-capi_license",
@@ -71,27 +69,20 @@
min_sdk_version: "S",
}
-rust_defaults {
- name: "rustc-demangle-capi_test_defaults",
+rust_test {
+ name: "rustc-demangle-capi_test_src_lib",
+ host_supported: true,
crate_name: "rustc_demangle",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2015",
rustlibs: [
"librustc_demangle",
],
}
-
-rust_test_host {
- name: "rustc-demangle-capi_host_test_src_lib",
- defaults: ["rustc-demangle-capi_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "rustc-demangle-capi_device_test_src_lib",
- defaults: ["rustc-demangle-capi_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0ffad29..947b45f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,12 @@
{
"presubmit": [
{
- "name": "rustc-demangle-capi_device_test_src_lib"
+ "name": "rustc-demangle-capi_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "rustc-demangle-capi_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 2353fe7..8837179 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,21 +1,21 @@
{
- "run": true,
- "exported_c_header_dir": [
- "include"
- ],
- "native_bridge_supported": true,
- "product_available": true,
- "recovery_available": true,
- "vendor_available": true,
- "vendor_ramdisk_available": true,
- "ramdisk_available": true,
"apex-available": [
"//apex_available:platform",
"com.android.runtime",
"com.android.art.debug",
"com.android.art"
],
- "min_sdk_version": "S",
"device": true,
- "tests": true
-}
+ "exported-c-header-dir": [
+ "include"
+ ],
+ "min-sdk-version": "S",
+ "native-bridge-supported": true,
+ "product-available": true,
+ "ramdisk-available": true,
+ "recovery-available": true,
+ "run": true,
+ "tests": true,
+ "vendor-available": true,
+ "vendor-ramdisk-available": true
+}
\ No newline at end of file