aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:35:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:35:31 +0000
commit75a521d81473205906fcf559133046db94818712 (patch)
tree9dd9146256b9975c26255e7227d088a9164d931b
parentdf9e225e8219f7c03a9a7f68339933063127c736 (diff)
parentbf87735f7788b2e182cac023d021e9458c8f4953 (diff)
downloaduuid-75a521d81473205906fcf559133046db94818712.tar.gz
Migrate to cargo_embargo. am: 095addb12a am: 3705005ec3 am: bf87735f77
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/uuid/+/2824670 Change-Id: I82178b0296d5f398d6bd8c0f6be3db968910abc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json17
-rw-r--r--cargo_embargo.json26
3 files changed, 27 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp
index a35ef78..fe212f7 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 3a42f4e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "run": true,
- "variants": [
- {
- "features": "serde,std,v1,v4"
- },
- {
- "features": "",
- "force-rlib": true,
- "no-host": true,
- "suffix": "_nostd",
- "no-std": true
- }
- ]
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..2736f99
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,26 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {
+ "features": [
+ "serde",
+ "std",
+ "v1",
+ "v4"
+ ]
+ },
+ {
+ "features": [],
+ "module_name_overrides": {
+ "libuuid": "libuuid_nostd"
+ },
+ "package": {
+ "uuid": {
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}