commit 2a3de09c126563790ad4d4640fcdfdd47282267d
author Andrew Walbran <qwandor@google.com> Thu Nov 09 03:10:25 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 09 03:10:25 2023 +0000
tree 9777f8b55bf81a9ab896767ed7036b1fe5be6f41
parent 2899632bc885381106638d5fcfe9e3664755fa4c
parent e3ca407806cb840a656d3dd0281acc18560edd45

Migrate to cargo_embargo. am: b8374cfeae am: e3ca407806

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/idna/+/2822155

Change-Id: Ia141995785282887cec9d4c945f650d73345ce36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index c80099f..4ffc58f 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 {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f9f13d4..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true
-}
\ No newline at end of file

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9617c46
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}