diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:32 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:32 +0000 |
commit | f41965bec09c37eaf6ae03a5998badc0a30a40d7 (patch) | |
tree | 15905d68e6b2891984258eb9da2049525d348acf | |
parent | 193533502ea2127d7411249c60ce86ea6e1e42a0 (diff) | |
parent | bd00f28c25a9d17d8fffa4effd9fc803927b8918 (diff) | |
download | rustc-demangle-capi-f41965bec09c37eaf6ae03a5998badc0a30a40d7.tar.gz |
Snap for 8006021 from bd00f28c25a9d17d8fffa4effd9fc803927b8918 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r20android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: Ifac8f2166a2a05cd354346227b54299d6c58c04c
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 7 | ||||
-rw-r--r-- | cargo2android.json | 26 |
3 files changed, 27 insertions, 31 deletions
@@ -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 @@ rust_ffi_static { 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 |