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 | a328bdd6991cbb45862170a767acb29c46c31dd5 (patch) | |
tree | 75f57a29ac6cac238a6e6aebb0f09f5d5c68f1a6 | |
parent | b2ac41244de18099ef118f48ac5116853546818d (diff) | |
parent | d3da86843facfe7ed426dc089e641acfe35ab629 (diff) | |
download | num-derive-a328bdd6991cbb45862170a767acb29c46c31dd5.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d3da86843f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-derive/+/1912647
Change-Id: I73b94c93d70a36bb97f6a4a0bc5726e8e48b857e
-rw-r--r-- | Android.bp | 11 | ||||
-rw-r--r-- | TEST_MAPPING | 17 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 25 insertions, 7 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device. +// 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_num-derive_license"], @@ -39,6 +40,8 @@ license { rust_proc_macro { name: "libnum_derive", crate_name: "num_derive", + cargo_env_compat: true, + cargo_pkg_version: "0.3.3", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -47,9 +50,3 @@ rust_proc_macro { "libsyn", ], } - -// dependent_library ["feature_list"] -// proc-macro2-1.0.24 "default,proc-macro" -// quote-1.0.7 "default,proc-macro" -// syn-1.0.48 "clone-impls,default,derive,parsing,printing,proc-macro,quote" -// unicode-xid-0.2.1 "default" diff --git a/TEST_MAPPING b/TEST_MAPPING index 28ea51d..386cb5e 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -8,6 +8,23 @@ "name": "libidsig.test" }, { + "name": "microdroid_manager_test" + }, + { + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ + { + "name": "apkdmverity.test" + }, + { + "name": "libidsig.test" + }, + { + "name": "microdroid_manager_test" + }, + { "name": "virtualizationservice_device_test" } ] diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |