diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:17 +0000 |
commit | c20285fe9e4c7aecccdbf5e472a82b387ecf5ddf (patch) | |
tree | 25eee8c8df8b41456966fdaf820f4cde502f5bfc | |
parent | 7ca9d439f68dd4f813b134f92d6a59eac2a4a5a5 (diff) | |
parent | f58679b0c4df7adc08fd92572f46a8199d26f1e3 (diff) | |
download | paste-c20285fe9e4c7aecccdbf5e472a82b387ecf5ddf.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9a295d8629 am: f58679b0c4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/paste/+/1912656
Change-Id: I3ee6bc1e3ebdcfa134893986f9aca247497a8617
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 15 | ||||
-rw-r--r-- | cargo2android.json | 3 |
3 files changed, 20 insertions, 2 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -40,6 +40,8 @@ license { rust_proc_macro { name: "libpaste", crate_name: "paste", + cargo_env_compat: true, + cargo_pkg_version: "1.0.5", srcs: ["src/lib.rs"], edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index 5f77ae8..162f83f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,5 +1,10 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/gdbstub_arch" + } + ], "presubmit": [ { "name": "ZipFuseTest" @@ -8,7 +13,15 @@ "name": "authfs_device_test_src_lib" }, { - "name": "gdbstub_arch_device_test_src_lib" + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..958632b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,3 @@ +{ + "run": true +}
\ No newline at end of file |