aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-04UPSTREAM: Set embedded_launcher: true for minijail testsHEADmastermainCole Faust
Android is migrating to using embedded_launcher for all python modules, fix these tests which have problems with embedded_launcher because they expect their data to be extracted to disk. The upstream cl is: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/5417234 Bug: 331488610 Test: m minijail_parser_unittest minijail_compiler_unittest && out/host/linux-x86/nativetest64/minijail_compiler_unittest/minijail_compiler_unittest && out/host/linux-x86/nativetest64/minijail_parser_unittest/minijail_parser_unittest Change-Id: Ib567ff8258eb7faf8db8bafb08214d72a11257e5
2024-03-11Remove VNDK definition(s)Kiyoung Kim
As of VNDK deprecation, any libraries that defines vndk is no longer valid anymore. This change removes all VNDK definition(s) from modules which was VNDK. Bug: 328994089 Test: AOSP CF build succeeded Change-Id: I4c0c66f18a23becb1c8d86dd5a37c44d528a8d9e
2023-12-05Migrate to cargo_embargo. am: 998d313eae am: d05a1ad34c am: 2543e1f6b7Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957 Change-Id: I90f9137b236e8d5d472f6707687bf1da853e2099 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Re-run cargo2android. am: d0108049d6 am: 5abdef9af1 am: 6796c3d56bAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: I76d5918b0ccab28a933f9ab376386ba7ef8b3f01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Migrate to cargo_embargo. am: 998d313eae am: fb554324d3 am: 500b9b467bAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957 Change-Id: Ieb4d8bb3ddccb6b5cdfe989e2d1f68b61b246eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Re-run cargo2android. am: d0108049d6 am: 114538f520 am: 445f5dc0ffAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: I6cb76cd5e92be99f796bfec793e1282f17a1ee4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Migrate to cargo_embargo. am: 998d313eae am: d05a1ad34cAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957 Change-Id: I1f92f66bc802b160b58997a8bc201cbc4584a469 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Re-run cargo2android. am: d0108049d6 am: 5abdef9af1Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: Ifa5dbb8968fd1b83a491e89a46f81ee79d50a587 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Migrate to cargo_embargo. am: 998d313eae am: fb554324d3Andrew Walbran
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>
2023-12-05Re-run cargo2android. am: d0108049d6 am: 114538f520Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: I2d595d58964f5e0331c84def47a38dd9184adbbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Migrate to cargo_embargo. am: 998d313eaeAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957 Change-Id: I344a0b858ef188f9ee1fca7cda92b3f871f28f20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Re-run cargo2android. am: d0108049d6Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: I253f5a843fd91d0a1718121246163a68ebebb970 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Migrate to cargo_embargo. am: 998d313eaeAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854957 Change-Id: Ie8fabb1968b9513fef7b2bfd63c42c3050fe5c56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Re-run cargo2android. am: d0108049d6Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2854956 Change-Id: I53f9427dde0e3379f781d92f313af8aefc0c4ced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Ignore-Upstream-First: Android build files are not upstream Test: Ran cargo_embargo, compared Android.bp Change-Id: Id2820964270f470d39a098a0b9c8b6427b8fed84
2023-12-04Re-run cargo2android.Andrew Walbran
Ignore-Upstream-First: Android build files are not upstream Test: Campared Android.bp Change-Id: I969ac853f3e8c16b752f83aa21bf0719d59c9e58
2023-11-14Make minijail vendor available am: 2b6ebf9250 am: 3b5f03ad95 am: 4c64a1ec7eArve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: Ifd9d59797401212b440eb789e857f86e94745120 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Make minijail vendor available am: 2b6ebf9250 am: b2b141b037 am: 7ec5a794e4Arve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: I0ad0d99809a54c4e6327f884a4009f1923e4bbd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Make minijail vendor available am: 2b6ebf9250 am: 3b5f03ad95Arve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: Iab74181401005352ff1813690cd1cbd748e325da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Make minijail vendor available am: 2b6ebf9250 am: b2b141b037Arve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: Iebf1dc7232df91216c1e308f4cbc717082329493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Make minijail vendor available am: 2b6ebf9250Arve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: I16c00562732c47f267cfb1f1c9af4ee530b90efc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Make minijail vendor available am: 2b6ebf9250Arve Hjønnevåg
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2817918 Change-Id: I945573d2282e22ac106a2aea6f8bffe066a9fb13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Make minijail vendor availableArve Hjønnevåg
Needed to make crosvm vendor available Ignore-Upstream-First: These android build files are not upstream Bug: 309149829 Test: build aosp_cf_x86_64_phone_trusty_vm-userdebug Change-Id: Ic432a0bc9b4ab593c2bf379eb705759dd350315e
2023-08-03UPSTREAM: Fix Python deprecation warnings am: 916b5cd784 am: 246f2047ab am: ↵Luca Farsi
8274d83120 am: 18cd0bdd23 am: ef88fa668a Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2691187 Change-Id: Ie83ef3598b5a2fedd4388312a555fc10da47342e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03UPSTREAM: Fix Python deprecation warnings am: 916b5cd784 am: 246f2047ab am: ↵Luca Farsi
8274d83120 am: 18cd0bdd23 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2691187 Change-Id: I9709f651988c82bd4fbad8cf7600c0b260e6703d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03UPSTREAM: Fix Python deprecation warnings am: 916b5cd784 am: 246f2047ab am: ↵Luca Farsi
8274d83120 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2691187 Change-Id: I8688f925dd883bf7cbb95cae37a6afb7843390c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02UPSTREAM: Fix Python deprecation warnings am: 916b5cd784 am: 246f2047abLuca Farsi
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2691187 Change-Id: I767bd9c0bf31043ee1ffcd1f587351a60508a448 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02UPSTREAM: Fix Python deprecation warnings am: 916b5cd784Luca Farsi
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2691187 Change-Id: I823ce717b720edc263c1aa244403ab428191ccc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02UPSTREAM: Fix Python deprecation warningsLuca Farsi
Sampling from a set is deprecated as of Python 3.9. Replace those calls with random.choices calls and convert the sets to lists to eliminate this warning. BUG=b:263326760 TEST=presubmit Change-Id: I338da56a726bfdee6b98a82cdd8a6d462b5745a3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/4694554 Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Luca Farsi <lucafarsi@google.com> Tested-by: Luca Farsi <lucafarsi@google.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 91886a8e4e -s ↵Xin Li
ours am: 653a6a6af3 -s ours am: 0a22d1d57c -s ours am: 3eb948fcc9 -s ours am skip reason: Merged-In I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 with SHA-1 6576586ae0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/24086475 Change-Id: I06841e094219572c1cd58a2d227102c3afc91365 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 91886a8e4e -s ↵Xin Li
ours am: 653a6a6af3 -s ours am: 0a22d1d57c -s ours am skip reason: Merged-In I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 with SHA-1 6576586ae0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/24086475 Change-Id: I305e6d776fc8cd2cf7e1660001acce489923606b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 91886a8e4e -s ↵Xin Li
ours am: 653a6a6af3 -s ours am skip reason: Merged-In I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 with SHA-1 6576586ae0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/24086475 Change-Id: I235d8794386b20c5d98ca2920577d470c54fea55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 91886a8e4e -s oursXin Li
am skip reason: Merged-In I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 with SHA-1 6576586ae0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minijail/+/24086475 Change-Id: I3b7216e67461b50a0789f12b059c5309c32c6e4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 Change-Id: I687ee600a876c1f13624da2a99cd32fe47777473
2023-07-12Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39 am: ↵Steven Moreland
8c559299fe am: 41dbe2a857 am: 9c3f76bdc6 am: 5279435679 am: 281a8e81b7 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: If19fbfa683ea18f7e2be813c48b1167eeb940187 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39 am: ↵Steven Moreland
8c559299fe am: 41dbe2a857 am: 9c3f76bdc6 am: 5279435679 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: Ia1b49aa9553264d230411502c5735087bfb16e03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39 am: ↵Steven Moreland
8c559299fe am: 41dbe2a857 am: 9c3f76bdc6 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: I2e50190c6f13be4e6964ace9db29654d6874977b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39 am: ↵Steven Moreland
8c559299fe am: 41dbe2a857 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: I3f9573ba6fad7a3bae95aa70fe1de5f837d7f345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39 am: 8c559299feSteven Moreland
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: I44387965371ce9676f3666d602ee1d520024a3a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Bindgen 0.65.1 no longer supports size_t-is-usize am: efaca93f39Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2653182 Change-Id: I35ce1c37bcc57d76fd19e7e6397e63075aed303d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Bindgen 0.65.1 no longer supports size_t-is-usizeSteven Moreland
The flag has been a default, and now is not accepted. Test: Treehugger, m rust Bug: 279198502 Bug: 276464273 Bug: 290354180 Change-Id: I5c3dd8e21dbbb0f51f4cb602f999c31e274470b8
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9 ↵Dylan Reid
am: 633e73cc52 am: 6576586ae0 am: 2fc923718e Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: I29bac3a7db23cacdc60416fbb9c5373c3ee7d0c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9 ↵Dylan Reid
am: 633e73cc52 am: 6576586ae0 am: d3e36182e8 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: Iabd8cc7c3440cd74c89edcedd6be9a2c0eb4dfc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9 ↵Dylan Reid
am: 633e73cc52 am: 6576586ae0 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: I55f856b436ef9464ab9fd57078949a36ea8dd5f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9 ↵Dylan Reid
am: 633e73cc52 am: 6576586ae0 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: Iad5e6820619173e211fcf9b9dbaa118ffb63b851 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9 ↵android14-devDylan Reid
am: 633e73cc52 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: I9fa93b1d6baed016244b2f33d8cc3b1fdde78bf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613d am: e8f9812cc9Dylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: I1d2d33c21f5019def95ae65a6f73d78f6e7f6ce1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14generate_constants_json: Add riscv64 arch_nr am: 38c215613dDylan Reid
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2537030 Change-Id: I3ac78032f5a0ea51cf4b51d951c70511d7fcc0d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13generate_constants_json: Add riscv64 arch_nrDylan Reid
To allow generating consants, add the mapping from arch_nr to arch_name for riscv64. BUG=None TEST=Run generate_constants_json.py for rv64 using crosvm's wrapper, `seccomp/generate_constants.sh` Change-Id: I03b99bf1460e8d360b6f1437c093e7b10693b8c8 Signed-off-by: Dylan Reid <dgreid@rivosinc.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/4159412 Reviewed-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Allen Webb <allenwebb@google.com>
2023-04-10PREUPLOAD hook to nudge sending code review to upstream am: 852af6ac35 am: ↵Victor Hsieh
df9c5bdcf8 am: a4c700d1ba am: 3b8b7debd2 am: 92e61507e2 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601 Change-Id: I9b58043964b40f8b0c1df0bf7cf544ad5d9af7c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>