aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from d3e36182e87f07b0e0bfaa6d14c8950a1c43bdfd to ↵aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-releaseAndroid Build Coastguard Worker
mainline-uwb-release Change-Id: I9706f669a6dc2487a5027942fea961eb598839d9
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 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601 Change-Id: I182341d1f047148d1c2a646a627595d5d3ec427f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10PREUPLOAD hook to nudge sending code review to upstream am: 852af6ac35 am: ↵Victor Hsieh
df9c5bdcf8 am: a4c700d1ba Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601 Change-Id: I99f9de8e601b7a5aa561f0cc071111d6ad7eaf8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10PREUPLOAD hook to nudge sending code review to upstream am: 852af6ac35 am: ↵Victor Hsieh
df9c5bdcf8 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601 Change-Id: I398bd9bf74458e04b1fde3983adf38ed6b075765 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10PREUPLOAD hook to nudge sending code review to upstream am: 852af6ac35Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2528601 Change-Id: Ia0e964376ccd5b42e87e63ae9493de4473edd90e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07PREUPLOAD hook to nudge sending code review to upstreamandroid-u-beta-1-gplVictor Hsieh
Ignore-Upstream-First: Only applicable to Android as downstream Bug: None Test: repo upload # both cases Change-Id: Ia5353829903a531e395cbd4a5c24ca63f9b83ae7
2023-03-20Add tags=["no-remote"] to minijail0_cli_unittest_gtest am: af5509b8c4 am: ↵zeek
4b6828d37a am: 6e516feca6 am: 135b26e50e Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2215167 Change-Id: Ia1b2b2a2e0cfd20e8dd7305defffe46abc32722b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Add tags=["no-remote"] to minijail0_cli_unittest_gtest am: af5509b8c4 am: ↵zeek
4b6828d37a am: 6e516feca6 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2215167 Change-Id: I513b78be6fb12602fabd680007127f9a8f7a5c6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Add tags=["no-remote"] to minijail0_cli_unittest_gtest am: af5509b8c4 am: ↵zeek
4b6828d37a Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2215167 Change-Id: I3d989687ee1ebb832f0799a0d37bc7309fa57184 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Add tags=["no-remote"] to minijail0_cli_unittest_gtest am: af5509b8c4zeek
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2215167 Change-Id: I97c8322068e7abcc9ba00a87caceb2cf00fdd273 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Add tags=["no-remote"] to minijail0_cli_unittest_gtestzeek
This tag disables Bazel remote mode for minijail0_cli_unittest_gtest. No impact to current Bazel local mode test execution. Bug: 236973602 Test: atest-src --host --experimental-remote \ minijail0_cli_unittest_gtest Change-Id: Ib83dc3719b71a506050796285d3bbe278a91c026
2023-03-04CHERRY-PICK: Extend host glibc workaround to userfaultfd am: 50257f14c9 am: ↵Alistair Delva
e5292e55b4 am: e3cd66aeb6 am: 552f6361af Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470183 Change-Id: I0a18fd6f7b0fc3985ebdce02202fc30d6013dca3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3 am: ↵Alistair Delva
822e93c765 am: 4bf50e90d1 am: 3a17443e99 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: If7bef83d665dd08f752a22fd763f9f214daf0bb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Extend host glibc workaround to userfaultfd am: 50257f14c9 am: ↵Alistair Delva
e5292e55b4 am: e3cd66aeb6 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470183 Change-Id: Ibce7c799ebf9ec3329eeef5ef59c53e80938ef03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3 am: ↵Alistair Delva
822e93c765 am: 4bf50e90d1 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: I27f0373ca6208943ad6a3e5a8f6fdbd295cbcf81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Extend host glibc workaround to userfaultfd am: 50257f14c9 am: ↵Alistair Delva
e5292e55b4 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470183 Change-Id: I016ab6eeca3525c82c93a1f9b65f4642da1415f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3 am: ↵Alistair Delva
822e93c765 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: I71d26346ee19331f886a8aec1cf4f16220f22da8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Extend host glibc workaround to userfaultfd am: 50257f14c9Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470183 Change-Id: I56c33ed605d7149e7d16869d36f9603273bbc474 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: Ida4176892867336d786bfc6f07b32e6ead20311e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03CHERRY-PICK: Extend host glibc workaround to userfaultfdAlistair Delva
The minijail seccomp policies for crosvm now require `userfaultfd`. Inspired by https://r.android.com/1887226 Test: TH Test: built and ran a cuttlefish target with sandboxing enabled Bug: 270439238 Change-Id: I4620d019e89c2d48a9647b6cce87d0674498e741 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/4287608 Auto-Submit: Alistair Delva <adelva@google.com> Tested-by: Alistair Delva <adelva@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com> Reviewed-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Alistair Delva <adelva@google.com>
2023-03-03CHERRY-PICK: Fix "Extend host glibc workaround to clone3"Alistair Delva
The workaround was applied inside a conditional for __NR_rseq which meant it would not take effect if used against a glibc with rseq but not clone3, such as the one in Debian 10. Test: local Bug: 246990922 Change-Id: I52e5be3d489c08e527211ab48848e73aabbbca2a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/3989233 Auto-Submit: Alistair Delva <adelva@google.com> Tested-by: Alistair Delva <adelva@google.com> Commit-Queue: Alistair Delva <adelva@google.com> Reviewed-by: Allen Webb <allenwebb@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com>
2023-01-05update for bindgen CLI change am: 3c6795b890 am: 2f7b8b0003 am: e4c41babe8Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2374658 Change-Id: Iaff9f1e12d90750b66bfbd1b93d9dbf1708af464 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05update for bindgen CLI change am: 3c6795b890 am: 2f7b8b0003Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2374658 Change-Id: I59dba14b294fa373117a350c75360a0cf5e00b5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05update for bindgen CLI change am: 3c6795b890Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2374658 Change-Id: Id34770b9daf1a776e4fb63b2d0df51707d160390 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05update for bindgen CLI changemain-16k-with-phonesSteven Moreland
Bug: 264314481 Test: worksies Change-Id: I7bff88a76c6524f6d89ca9c671a385c5f36b5cc6
2023-01-04minijail: add local definitions of MADV_FREE and __NR_membarrier am: ↵Colin Cross
45b8aa4693 am: 9fd8cacad0 am: d3bce99497 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2366449 Change-Id: Idc77d1f7683dcdeb804429a4f3e10963dcf4ebdf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04minijail: add local definitions of MADV_FREE and __NR_membarrier am: ↵Colin Cross
45b8aa4693 am: 9fd8cacad0 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2366449 Change-Id: Id387514bceae6caa9077e8327cf4aab69d4f8215 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04minijail: add local definitions of MADV_FREE and __NR_membarrier am: 45b8aa4693Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2366449 Change-Id: I510bc65fe11cc6dc7970f7189464a7faee229ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21minijail: add local definitions of MADV_FREE and __NR_membarrierColin Cross
MADV_FREE and __NR_membarrier are used internally by musl libc and therefore added to the crosvm seccomp policies by b/258117555, but are not defined by the old glibc prebuilts in the Android platform. Add defines for MADV_FREE and __NR_mmebarrier to gen_constants-inl.h and gen_syscalls-inl.h. Bug: 263152407 Test: launch_cvd --cpus=4 --memory_mb=4096 --console=true --enable_sandbox=true --base_instance_num=1 --report_anonymous_usage_stats=n --undefok=base_instance_num,console,enable_sandbox,report_anonymous_usage_stats Change-Id: I9633e7403f924cdf454c9dc3bebae7740f621091
2022-11-03[LSC] Add LOCAL_LICENSE_KINDS to external/minijail am: c30d299f93 am: ↵Bob Badour
74b0aeb2ce am: e3e22f06b4 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2281624 Change-Id: I0036a94506c40767341876a187cb88f62123eaa1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03[LSC] Add LOCAL_LICENSE_KINDS to external/minijail am: c30d299f93 am: 74b0aeb2ceBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2281624 Change-Id: I1f2f0512500dd63d0093e48b652d233c5d19cf1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03[LSC] Add LOCAL_LICENSE_KINDS to external/minijail am: c30d299f93Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2281624 Change-Id: Ide59d849c4ae8340adb525e19251794c6f028b35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03[LSC] Add LOCAL_LICENSE_KINDS to external/minijailBob Badour
Added SPDX-license-identifier-BSD to: rust/minijail-sys/Android.bp rust/minijail/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I8caa5d3a3ac86ec0e80ec389f68622ab1c95e26c
2022-10-27Revert "Generate tests for libminijail_rust" am: a6ad26d902 am: 0d2f4c1d20 ↵Victor Hsieh
am: 6fbb88458d Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2275166 Change-Id: I9e440023101f8b66dd3063ccabe82d2ed23fe692 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Revert "Generate tests for libminijail_rust" am: a6ad26d902 am: 0d2f4c1d20Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2275166 Change-Id: I360aae8638488f93767a4d3fe152e1b9e2ed50a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Revert "Generate tests for libminijail_rust" am: a6ad26d902Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2275166 Change-Id: I1a20021e842c0d71bc9379703b5b2a386f6f628f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Generate tests for libminijail_rust am: d339627163 am: 3ebaacab5e am: d22c922b86Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269249 Change-Id: I3330e041d4246223e069be1082a92bfc69fd8a42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27minijail: use canonical cargo2android setup am: 62f26bd6a7 am: 6d9e82e626 ↵Victor Hsieh
am: 833175cb8a Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269248 Change-Id: I059cc6d641dbb311674e5bc0eaa34fac77aa227b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Fix OWNERS setup am: 1ea39aaca5 am: 7f43658eaa am: 37139055f9Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2271939 Change-Id: If5bce6cf6714b92753db997a0501acc173e4ff3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Revert "Generate tests for libminijail_rust"Victor Hsieh
This reverts commit d339627163354e40585bc48c92bce2dce16a3ddb. Reason for revert: b/255992220 Bug: 255992220 Change-Id: I0dffbeac3352d93f06df71d4a0eb16de4d6106e4
2022-10-27Generate tests for libminijail_rust am: d339627163 am: 3ebaacab5eVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269249 Change-Id: I88e4c42e1eca53b429b62ef1103bd909bcc6a248 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27minijail: use canonical cargo2android setup am: 62f26bd6a7 am: 6d9e82e626Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269248 Change-Id: I94ecba557566d6d41c333ba157e9906c02c00456 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Fix OWNERS setup am: 1ea39aaca5 am: 7f43658eaaVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2271939 Change-Id: Icd3cdb0b60d83728d743bf016243f7a3f162d1cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27Generate tests for libminijail_rust am: d339627163Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269249 Change-Id: Ibf602ebe5d3102e1e9b015715d7f9c8f9f32efeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27minijail: use canonical cargo2android setup am: 62f26bd6a7Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2269248 Change-Id: I1a1abaf787aecea6e76d67d21ba2f5c434a27ce1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>