diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:23:08 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:23:08 +0000 |
commit | f7dfc076722a63b31697f660a24e2d995abc060a (patch) | |
tree | 7502b447083050713ffefcf404787bd5376f4a00 | |
parent | de45d75cee85d33d4ab32eabf2e337b1e2ca912b (diff) | |
parent | 44c05dc3e40614dfa15cea5caaaf76879535c61d (diff) | |
download | managed-aml_art_331314010.tar.gz |
Snap for 8564071 from 44c05dc3e40614dfa15cea5caaaf76879535c61d to mainline-art-releaseaml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-art-release
Change-Id: I24297a7499d916026eaf2c4b8cc2b3186c0adfce
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | TEST_MAPPING | 18 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 35 insertions, 20 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests --dependencies --no-subdir. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,24 +22,28 @@ rust_library { name: "libmanaged", host_supported: true, crate_name: "managed", + cargo_env_compat: true, + cargo_pkg_version: "0.8.0", srcs: ["src/lib.rs"], edition: "2015", - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], features: [ "default", "std", ], } -rust_defaults { - name: "managed_defaults", +rust_test { + name: "managed_test_src_lib", + host_supported: true, crate_name: "managed", + cargo_env_compat: true, + cargo_pkg_version: "0.8.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -50,16 +54,3 @@ rust_defaults { "-C opt-level=1", ], } - -rust_test_host { - name: "managed_host_test_src_lib", - defaults: ["managed_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "managed_device_test_src_lib", - defaults: ["managed_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 0000000..f9cd6e4 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,18 @@ +// Generated by update_crate_tests.py for tests that depend on this crate. +{ + "imports": [ + { + "path": "external/rust/crates/gdbstub_arch" + } + ], + "presubmit": [ + { + "name": "managed_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "managed_test_src_lib" + } + ] +} diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..1d312fd --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,6 @@ +{ + "device": true, + "no-subdir": true, + "run": true, + "tests": true +}
\ No newline at end of file |