diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-14 12:25:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 12:25:26 +0000 |
commit | 4d7f334de8424f0d0d2be8d8263f8e8de6041b83 (patch) | |
tree | 631ee33a3d70f55f47d6646dbdf7345e87a29909 | |
parent | 889fe0cde047ffe3252925df194b2b8469b3c400 (diff) | |
parent | bd2f48b8e70194ca98b0e2da2e9aba0d32bc91c7 (diff) | |
download | predicates-main.tar.gz |
Merge "Migrate to cargo_embargo." into main am: c10e772665 am: 7ae6acf5b3 am: bd2f48b8e7main
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/predicates/+/2871180
Change-Id: I4e9342852cfba147e3907e51934e27d51c911a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 6 | ||||
-rw-r--r-- | cargo_embargo.json | 8 |
3 files changed, 9 insertions, 9 deletions
@@ -1,8 +1,6 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. - - rust_library { name: "libpredicates", host_supported: true, diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 6958d82..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "device": true, - "features": "regex,color", - "run": true, - "tests": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..c5e9f11 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,8 @@ +{ + "features": [ + "regex", + "color" + ], + "run_cargo": false, + "tests": true +} |