diff options
author | Andrew Walbran <qwandor@google.com> | 2023-12-05 15:08:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-05 15:08:00 +0000 |
commit | 500b9b467b7e2a1a486a829ef56659bd8cd2953a (patch) | |
tree | 5b9cc0cb6749d9981b9951d1899963a15ede9a01 | |
parent | 445f5dc0ffff4e7bb7c1b2cb114e5226c4979be9 (diff) | |
parent | fb554324d3446ae9d350cf9a4a80b435774c6406 (diff) | |
download | minijail-500b9b467b7e2a1a486a829ef56659bd8cd2953a.tar.gz |
Migrate to cargo_embargo. am: 998d313eae am: fb554324d3
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957
Change-Id: I40b6e6f292fb3e43e3870011d006157a84b46d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | rust/minijail-sys/Android.bp | 6 | ||||
-rw-r--r-- | rust/minijail-sys/cargo2android.json | 13 | ||||
-rw-r--r-- | rust/minijail-sys/cargo_embargo.json | 15 | ||||
-rw-r--r-- | rust/minijail-sys/patches/Android.bp.patch | 10 | ||||
-rw-r--r-- | rust/minijail/Android.bp | 3 | ||||
-rw-r--r-- | rust/minijail/cargo_embargo.json (renamed from rust/minijail/cargo2android.json) | 7 |
6 files changed, 26 insertions, 28 deletions
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/cargo_embargo.json index d2adf3e..dd2bfad 100644 --- a/rust/minijail/cargo2android.json +++ b/rust/minijail/cargo_embargo.json @@ -1,9 +1,8 @@ { - "run": true, - "device": true, - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.compos", "com.android.virt" - ] + ], + "run_cargo": false } |