diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:01:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:01:55 +0000 |
| commit | e5ca253d814364cdf020765e544054423e8780b1 (patch) | |
| tree | 15905d68e6b2891984258eb9da2049525d348acf | |
| parent | 6a57bb5859f84b6fc13b4d43c0299244e4e43963 (diff) | |
| parent | d413f091b6146f2ea762a20bb463f7a89d0fe97c (diff) | |
| download | rustc-demangle-capi-e5ca253d814364cdf020765e544054423e8780b1.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d413f091b6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rustc-demangle-capi/+/1912694
Change-Id: I87e7ae990969129477b04e7a15fd2e52887e8371
| -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 |