aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-09 21:28:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-09 21:28:06 +0000
commit9aec353ff61e4e5b19f15529734cc60e21198435 (patch)
tree0a4f65679f0c7d08b29d72ef600c8e0f11015380
parent7daa640363c5985010a8c118b7815b8e73954867 (diff)
parent98928489b791f08ba6093656a615422eb5f9366a (diff)
downloadbyteorder-9aec353ff61e4e5b19f15529734cc60e21198435.tar.gz
Migrate to cargo_embargo. am: 02183ab4cd am: a39ca4202f am: 98928489b7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/byteorder/+/2824515 Change-Id: Ic43dc11652567945c825a82b573754bfcdf9bb7a 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.json19
3 files changed, 20 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index 4af177a..e0bece5 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 1014789..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "run": true,
- "variants": [
- {
- },
- {
- "features": "",
- "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..e073779
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,19 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {},
+ {
+ "features": [],
+ "module_name_overrides": {
+ "libbyteorder": "libbyteorder_nostd"
+ },
+ "package": {
+ "byteorder": {
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}