aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:34:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:34:45 +0000
commit111be22a7b2f833219487d0780620c9d3febc1c9 (patch)
tree51ee08f81f2b59fe4e5ff8dadc484a681ea9e175
parentf05fdb5390e3616de5dc4f3dc18aac2b71bf4f92 (diff)
parent9dd9a9fb286f97d778227850409516530e5b3643 (diff)
downloadhalf-111be22a7b2f833219487d0780620c9d3febc1c9.tar.gz
Migrate to cargo_embargo. am: 22f4e7a52a am: 5762ba2a98 am: 9dd9a9fb28
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/half/+/2822894 Change-Id: I817b0ec2125d719cd9139e6536a89ef433abb095 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json16
-rw-r--r--cargo_embargo.json22
3 files changed, 23 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index eabdcd9..a18e36c 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 1f63124..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "device": true,
- "run": true,
- "variants": [
- {
- },
- {
- "alloc": true,
- "features": "alloc",
- "force-rlib": true,
- "no-host": true,
- "suffix": "_nostd",
- "no-std": true
- }
- ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3d17d7f
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,22 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {},
+ {
+ "features": [
+ "alloc"
+ ],
+ "module_name_overrides": {
+ "libhalf": "libhalf_nostd"
+ },
+ "package": {
+ "half": {
+ "alloc": true,
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}