aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:14:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:14:32 +0000
commit47841215b82f0c62a1bfad29658796d537380f08 (patch)
tree409bfabab642248d521db866bb4974ebc5c231e5
parenta980d4626afc5c31f0a78818562df213e1d5a485 (diff)
parentca53f258b4488e796e1bc25297dac5edc339b03b (diff)
downloadaho-corasick-47841215b82f0c62a1bfad29658796d537380f08.tar.gz
Migrate to cargo_embargo. am: 5410069166 am: ca53f258b4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aho-corasick/+/2769499 Change-Id: I9f1f11475532e14879d1236c4532e4f70c116b45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo_embargo.json (renamed from cargo2android.json)9
2 files changed, 6 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index ced92eb..f170196 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// 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.
package {
@@ -55,9 +55,7 @@ rust_test {
"default",
"std",
],
- rustlibs: [
- "libmemchr",
- ],
+ rustlibs: ["libmemchr"],
}
rust_library {
@@ -72,9 +70,7 @@ rust_library {
"default",
"std",
],
- rustlibs: [
- "libmemchr",
- ],
+ rustlibs: ["libmemchr"],
apex_available: [
"//apex_available:platform",
"com.android.compos",
diff --git a/cargo2android.json b/cargo_embargo.json
index bef74ca..b553798 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,12 +1,9 @@
{
- "apex-available": [
+ "tests": true,
+ "apex_available": [
"//apex_available:platform",
"com.android.compos",
"com.android.virt"
],
- "dependencies": true,
- "device": true,
- "run": true,
- "tests": true,
- "vendor-available": true
+ "run_cargo": false
}