From 998d313eaecf4d658145320eb54ef233bc4c66c5 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 4 Dec 2023 16:46:32 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Ignore-Upstream-First: Android build files are not upstream
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Id2820964270f470d39a098a0b9c8b6427b8fed84
---
 rust/minijail-sys/Android.bp               |  6 ++----
 rust/minijail-sys/cargo2android.json       | 13 -------------
 rust/minijail-sys/cargo_embargo.json       | 15 +++++++++++++++
 rust/minijail-sys/patches/Android.bp.patch | 10 +++++-----
 rust/minijail/Android.bp                   |  3 +--
 rust/minijail/cargo2android.json           |  9 ---------
 rust/minijail/cargo_embargo.json           |  8 ++++++++
 7 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 rust/minijail-sys/cargo2android.json
 create mode 100644 rust/minijail-sys/cargo_embargo.json
 delete mode 100644 rust/minijail/cargo2android.json
 create mode 100644 rust/minijail/cargo_embargo.json

diff --git a/rust/minijail-sys/Android.bp b/rust/minijail-sys/Android.bp
index 3f5e555..e920e8a 100644
--- a/rust/minijail-sys/Android.bp
+++ b/rust/minijail-sys/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 {
@@ -18,9 +18,7 @@ rust_library {
     cargo_pkg_version: "0.0.13",
     srcs: ["lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     shared_libs: [
         "libcap",
         "libminijail",
diff --git a/rust/minijail-sys/cargo2android.json b/rust/minijail-sys/cargo2android.json
deleted file mode 100644
index 4fb4f8f..0000000
--- a/rust/minijail-sys/cargo2android.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "run": true,
-  "device": true,
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "patch": "patches/Android.bp.patch",
-  "lib-blocklist": [
-    "minijail.pic"
-  ]
-}
diff --git a/rust/minijail-sys/cargo_embargo.json b/rust/minijail-sys/cargo_embargo.json
new file mode 100644
index 0000000..1aab646
--- /dev/null
+++ b/rust/minijail-sys/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "package": {
+    "minijail-sys": {
+      "dep_blocklist": [
+        "libminijail.pic"
+      ],
+      "patch": "patches/Android.bp.patch"
+    }
+  }
+}
diff --git a/rust/minijail-sys/patches/Android.bp.patch b/rust/minijail-sys/patches/Android.bp.patch
index fe5115c..a08a9ce 100644
--- a/rust/minijail-sys/patches/Android.bp.patch
+++ b/rust/minijail-sys/patches/Android.bp.patch
@@ -1,11 +1,11 @@
 diff --git a/rust/minijail-sys/Android.bp b/rust/minijail-sys/Android.bp
-index bdba0d7..788dc77 100644
+index cbef76a..e920e8a 100644
 --- a/rust/minijail-sys/Android.bp
 +++ b/rust/minijail-sys/Android.bp
-@@ -14,7 +14,10 @@ rust_library {
-     rustlibs: [
-         "liblibc",
-     ],
+@@ -19,7 +19,10 @@ rust_library {
+     srcs: ["lib.rs"],
+     edition: "2018",
+     rustlibs: ["liblibc"],
 -    shared_libs: ["libcap"],
 +    shared_libs: [
 +        "libcap",
diff --git a/rust/minijail/Android.bp b/rust/minijail/Android.bp
index 9b9d8e7..dce38b3 100644
--- a/rust/minijail/Android.bp
+++ b/rust/minijail/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 {
@@ -12,7 +12,6 @@ package {
 
 rust_library {
     name: "libminijail_rust",
-    stem: "libminijail",
     host_supported: true,
     crate_name: "minijail",
     cargo_env_compat: true,
diff --git a/rust/minijail/cargo2android.json b/rust/minijail/cargo2android.json
deleted file mode 100644
index d2adf3e..0000000
--- a/rust/minijail/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "run": true,
-  "device": true,
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ]
-}
diff --git a/rust/minijail/cargo_embargo.json b/rust/minijail/cargo_embargo.json
new file mode 100644
index 0000000..dd2bfad
--- /dev/null
+++ b/rust/minijail/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "run_cargo": false
+}
-- 
cgit v1.2.3