commit 6973449a6634fb32010084f6cc9e4b0e145a02ad
author Andrew Walbran <qwandor@google.com> Mon Nov 20 16:14:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 20 16:14:35 2023 +0000
tree 4cdb9480305c1f26508a75c711cabff8efedffd8
parent 4d228bc13a3d897147f5d290cf3ede01b25cf720
parent 8725301739be8b074dfb9f94375b351ea18dac2c

Migrate to cargo_embargo. am: 8725301739

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

Change-Id: Ib79b6526fe4de481b95115f78158b89047b93cf0
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 dddc7ae..81ae991 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 {
@@ -26,9 +26,7 @@
     cargo_pkg_version: "1.0.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4f8003c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": false
-}

cargo_embargo.json

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