diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:51 +0000 |
commit | aaa0efee5593cc4c5fab20e5835c0c31631845cf (patch) | |
tree | a4ad33c12767c537e62c002f4b808f2535f25734 | |
parent | ceaf6f1923feb4e3ae1cc5a95a5e5f4bf2d31886 (diff) | |
parent | 5a079e62d052cfeb6b8723e39a1c97872604a38e (diff) | |
download | remain-aaa0efee5593cc4c5fab20e5835c0c31631845cf.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9226a713fe am: 5a079e62d0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remain/+/1912531
Change-Id: Ib377e0e2de414f00d3649ee3f586a7358bf7c1ed
-rw-r--r-- | Android.bp | 11 | ||||
-rw-r--r-- | TEST_MAPPING | 23 | ||||
-rw-r--r-- | cargo2android.json | 3 |
3 files changed, 30 insertions, 7 deletions
@@ -1,4 +1,5 @@ -// 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 { default_applicable_licenses: ["external_rust_crates_remain_license"], @@ -39,6 +40,8 @@ license { rust_proc_macro { name: "libremain", crate_name: "remain", + cargo_env_compat: true, + cargo_pkg_version: "0.2.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -47,9 +50,3 @@ rust_proc_macro { "libsyn", ], } - -// dependent_library ["feature_list"] -// proc-macro2-1.0.18 "default,proc-macro" -// quote-1.0.7 "default,proc-macro" -// syn-1.0.33 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit,visit-mut" -// unicode-xid-0.2.1 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index b57b334..129fb3b 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,6 +2,29 @@ { "presubmit": [ { + "name": "ZipFuseTest" + }, + { + "name": "apkdmverity.test" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "ZipFuseTest" + }, + { + "name": "apkdmverity.test" + }, + { + "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 |