Snap for 8006021 from 328af6e6f37a39c0a5b8ba95c993057f69337a90 to tm-d1-release
Change-Id: I1e25839c9b984784b71852ca9e27d958c1c85fe9
diff --git a/Android.bp b/Android.bp
index 7a65237..d98d15c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,26 +62,17 @@
min_sdk_version: "S",
}
-rust_defaults {
- name: "rustc-demangle_test_defaults",
+rust_test {
+ name: "rustc-demangle_test_src_lib",
+ host_supported: true,
crate_name: "rustc_demangle",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.1.21",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2015",
-}
-
-rust_test_host {
- name: "rustc-demangle_host_test_src_lib",
- defaults: ["rustc-demangle_test_defaults"],
test_options: {
unit_test: true,
},
-}
-
-rust_test {
- name: "rustc-demangle_device_test_src_lib",
- defaults: ["rustc-demangle_test_defaults"],
+ edition: "2015",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d372f09..fe4f528 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,11 +1,18 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/rustc-demangle-capi"
+ }
+ ],
"presubmit": [
{
- "name": "rustc-demangle-capi_device_test_src_lib"
- },
+ "name": "rustc-demangle_test_src_lib"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "rustc-demangle_device_test_src_lib"
+ "name": "rustc-demangle_test_src_lib"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 6d34311..a13f256 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,18 +1,18 @@
{
- "run": true,
- "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
-}
+ "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
