aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 21:49:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 21:49:39 +0000
commitebe79e71f0bb39c358182f2b976819838e36b39d (patch)
treee3632568202aef7fbaa4d02c2d0b81d636a2aba9
parentb7b136a03331faf4fa78624fb60aed2d9fb1e113 (diff)
parent13258ba725c209ed3764aa7afdd29231a8185b5a (diff)
downloadhex-ebe79e71f0bb39c358182f2b976819838e36b39d.tar.gz
Migrate to cargo_embargo. am: 09fa908e3c am: 13258ba725
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/hex/+/2826431 Change-Id: Ib0046c37ec878c98a60f2361c148485274f5d6e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json18
-rw-r--r--cargo_embargo.json22
3 files changed, 23 insertions, 19 deletions
diff --git a/Android.bp b/Android.bp
index 277e33f..bcd2bb2 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ca16a7e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "device": true,
- "run": true,
- "vendor-available": true,
- "variants": [
- {
- },
- {
- "device": true,
- "alloc": true,
- "no-host": true,
- "force-rlib": true,
- "suffix": "_nostd",
- "no-std": true,
- "features" : "alloc"
- }
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3bbad79
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,22 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {},
+ {
+ "features": [
+ "alloc"
+ ],
+ "module_name_overrides": {
+ "libhex": "libhex_nostd"
+ },
+ "package": {
+ "hex": {
+ "alloc": true,
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}