aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 19:18:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-18 19:18:11 +0000
commitc5b23273f7c0da337f12932326f2f648a7997bb2 (patch)
tree327ae0a399bfd7fd1d79e65c2cc13913f41bde9a
parent101d841116e8341ca2082cb8d656f1b85033a76c (diff)
parenteabe10c8e517840fb724f31dbf0732fa4e32c90c (diff)
downloadanes-c5b23273f7c0da337f12932326f2f648a7997bb2.tar.gz
Migrate to cargo_embargo. am: 35acf1dc8f am: 3d5dcd2f36 am: eabe10c8e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anes/+/2796412 Change-Id: Iac1962c70dc16ce5f07454c0090c9f6b389a3a3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--cargo2android.json9
-rw-r--r--cargo_embargo.json10
3 files changed, 12 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index 36ba6ab..387051e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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.
-
-
package {
default_applicable_licenses: ["external_rust_crates_anes_license"],
}
@@ -100,9 +98,7 @@ rust_library {
"bitflags",
"parser",
],
- rustlibs: [
- "libbitflags-1.3.2",
- ],
+ rustlibs: ["libbitflags-1.3.2"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index eac39f0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "device": true,
- "run": true,
- "features": "parser",
- "tests": true,
- "dep-suffixes": {
- "bitflags": "-1.3.2"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..71c6d2d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+ "tests": true,
+ "features": [
+ "parser"
+ ],
+ "module_name_overrides": {
+ "libbitflags": "libbitflags-1.3.2"
+ },
+ "run_cargo": false
+}