diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:05:10 -0800 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:33:22 -0800 |
| commit | 2c47db292c220f7c8d5e16c694fd56ca98ecd5c7 (patch) | |
| tree | f6456e13b9c64d74c9ec2b0a3265bcb060bee502 | |
| parent | 8758877a8da0ae047bc1805d36f517c32b50a0de (diff) | |
| download | rustc-demangle-2c47db292c220f7c8d5e16c694fd56ca98ecd5c7.tar.gz | |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I2cef683122e69790086843be1693471987b94587
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | cargo2android.json | 20 |
3 files changed, 25 insertions, 27 deletions
@@ -62,26 +62,17 @@ rust_library { 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 |