minijail: use canonical cargo2android setup
* Remove the original rules from the top level Android.bp.
* libminijail.pic is manually replaced with libminijail, since this
change is to focus on the build cleanup.
* libminijail.rs was out of sync, and is now updated during
cargo2android
* This file is being superseded by build.rs in upstream
https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/3975851
* ... which is the motivation to clean up the current setup to make
later changes easier
Bug: N/A
Test: m sync
Change-Id: I5247b998b98a5ed4955e836fbd1cd0ba5ac37a26
diff --git a/Android.bp b/Android.bp
index e771f95..25eb12f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -551,55 +551,3 @@
static_libs: ["libminijail_generated"],
shared_libs: minijailCommonLibraries + ["libminijail"],
}
-
-rust_defaults {
- name: "libminijail_rust_defaults",
- target: {
- darwin: {
- enabled: false,
- },
- },
-}
-
-// This target was generated by cargo2android.py --run --device, with some
-// manual fixes.
-rust_library {
- name: "libminijail_sys",
- defaults: ["libminijail_rust_defaults"],
- host_supported: true,
- crate_name: "minijail_sys",
- srcs: ["rust/minijail-sys/lib.rs"],
- edition: "2018",
- rustlibs: [
- "liblibc",
- ],
- shared_libs: [
- "libcap",
- "libminijail",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.compos",
- "com.android.virt",
- ],
-}
-
-// This target was generated by cargo2android.py --run --device, with some
-// manual fixes.
-rust_library {
- name: "libminijail_rust",
- defaults: ["libminijail_rust_defaults"],
- host_supported: true,
- crate_name: "minijail",
- srcs: ["rust/minijail/src/lib.rs"],
- edition: "2018",
- rustlibs: [
- "liblibc",
- "libminijail_sys",
- ],
- apex_available: [
- "//apex_available:platform",
- "com.android.compos",
- "com.android.virt",
- ],
-}
diff --git a/rust/minijail-sys/Android.bp b/rust/minijail-sys/Android.bp
new file mode 100644
index 0000000..788dc77
--- /dev/null
+++ b/rust/minijail-sys/Android.bp
@@ -0,0 +1,26 @@
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
+
+
+
+rust_library {
+ name: "libminijail_sys",
+ host_supported: true,
+ crate_name: "minijail_sys",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.0.13",
+ srcs: ["lib.rs"],
+ edition: "2018",
+ rustlibs: [
+ "liblibc",
+ ],
+ shared_libs: [
+ "libcap",
+ "libminijail",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.compos",
+ "com.android.virt",
+ ],
+}
diff --git a/rust/minijail-sys/cargo2android.json b/rust/minijail-sys/cargo2android.json
new file mode 100644
index 0000000..4fb4f8f
--- /dev/null
+++ b/rust/minijail-sys/cargo2android.json
@@ -0,0 +1,13 @@
+{
+ "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/libminijail.rs b/rust/minijail-sys/libminijail.rs
index 1e09fa5..a867aee 100644
--- a/rust/minijail-sys/libminijail.rs
+++ b/rust/minijail-sys/libminijail.rs
@@ -97,6 +97,15 @@
pub fn minijail_set_seccomp_filter_tsync(j: *mut minijail);
}
extern "C" {
+ pub fn minijail_set_using_minimalistic_mountns(j: *mut minijail);
+}
+extern "C" {
+ pub fn minijail_add_minimalistic_mountns_fs_rules(j: *mut minijail);
+}
+extern "C" {
+ pub fn minijail_enable_default_fs_restrictions(j: *mut minijail);
+}
+extern "C" {
pub fn minijail_set_seccomp_filter_allow_speculation(j: *mut minijail);
}
extern "C" {
@@ -252,6 +261,12 @@
) -> ::std::os::raw::c_int;
}
extern "C" {
+ pub fn minijail_add_fs_restriction_edit(
+ j: *mut minijail,
+ path: *const ::std::os::raw::c_char,
+ ) -> ::std::os::raw::c_int;
+}
+extern "C" {
pub fn minijail_forward_signals(j: *mut minijail) -> ::std::os::raw::c_int;
}
extern "C" {
diff --git a/rust/minijail-sys/patches/Android.bp.patch b/rust/minijail-sys/patches/Android.bp.patch
new file mode 100644
index 0000000..fe5115c
--- /dev/null
+++ b/rust/minijail-sys/patches/Android.bp.patch
@@ -0,0 +1,16 @@
+diff --git a/rust/minijail-sys/Android.bp b/rust/minijail-sys/Android.bp
+index bdba0d7..788dc77 100644
+--- a/rust/minijail-sys/Android.bp
++++ b/rust/minijail-sys/Android.bp
+@@ -14,7 +14,10 @@ rust_library {
+ rustlibs: [
+ "liblibc",
+ ],
+- shared_libs: ["libcap"],
++ shared_libs: [
++ "libcap",
++ "libminijail",
++ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.compos",
diff --git a/rust/minijail/Android.bp b/rust/minijail/Android.bp
new file mode 100644
index 0000000..f043798
--- /dev/null
+++ b/rust/minijail/Android.bp
@@ -0,0 +1,24 @@
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
+
+
+
+rust_library {
+ name: "libminijail_rust",
+ stem: "libminijail",
+ host_supported: true,
+ crate_name: "minijail",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.2.3",
+ srcs: ["src/lib.rs"],
+ edition: "2018",
+ rustlibs: [
+ "liblibc",
+ "libminijail_sys",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.compos",
+ "com.android.virt",
+ ],
+}
diff --git a/rust/minijail/cargo2android.json b/rust/minijail/cargo2android.json
new file mode 100644
index 0000000..d2adf3e
--- /dev/null
+++ b/rust/minijail/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "run": true,
+ "device": true,
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.compos",
+ "com.android.virt"
+ ]
+}
