diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:12 +0000 |
commit | 305848bac29a9336bccd0a3d27a5ab9120bae8ba (patch) | |
tree | 7502b447083050713ffefcf404787bd5376f4a00 | |
parent | 2dc565b0f2fbd21806ac9042e49aa25dee58975d (diff) | |
parent | ba3142a22eeb7c4fc51a814ad783bfb4a15429c4 (diff) | |
download | managed-305848bac29a9336bccd0a3d27a5ab9120bae8ba.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: c6d44ef2ba am: 4c91ac7397 am: ba3142a22e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/managed/+/1912608
Change-Id: I087073748da79211e788567b6d8e7576b6ef5bec
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 6 |
3 files changed, 27 insertions, 23 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 index f6a57ed..f9cd6e4 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/gdbstub_arch" + } + ], "presubmit": [ { - "name": "gdbstub_arch_device_test_src_lib" - }, + "name": "managed_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "managed_device_test_src_lib" + "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 |