Commit graph

1786 commits

Author SHA1 Message Date
Maciej Żenczykowski
7fc5ed852a [automerger skipped] bpfloader: add ability to disable btfloader am: bbab818687 am: 8b6b108865 -s ours am: 83868d22e9 -s ours am: 9a084b7a22 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2133348

Change-Id: I56d0ecd9cf5d20d910199526e31de56c2ad79c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:11:47 +00:00
Maciej Żenczykowski
73c7338e88 const-ify mapMatchesExpectations arguments am: 1a7fff3568 am: 9cfd5090df am: 38b068d821 am: b1701ae197
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132835

Change-Id: Ib64ff1a45815d744c6c17827499dff09b51f297e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:10:48 +00:00
Maciej Żenczykowski
e9d8306828 Revert "disable bpfloader selinux_context support" am: 687849e52e am: 5fe153224c am: 0333e18c2e am: 84f8aa86ab
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Change-Id: I5e43580e48f701d9ccc2dc7ec1cceb54045f0fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:08:22 +00:00
Maciej Żenczykowski
9a084b7a22 [automerger skipped] bpfloader: add ability to disable btfloader am: bbab818687 am: 8b6b108865 -s ours am: 83868d22e9 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2133348

Change-Id: Ifbd668aaab60513c25307ca59e94b60595cfad5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:02:17 +00:00
Maciej Żenczykowski
b1701ae197 const-ify mapMatchesExpectations arguments am: 1a7fff3568 am: 9cfd5090df am: 38b068d821
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132835

Change-Id: Ib164e440de76e1873f03bbaadc53d0a18e0bfb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:59:55 +00:00
Maciej Żenczykowski
84f8aa86ab Revert "disable bpfloader selinux_context support" am: 687849e52e am: 5fe153224c am: 0333e18c2e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Change-Id: I450df84d7b433647c1b9a36901161cf4f2acc7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:58:35 +00:00
Maciej Żenczykowski
83868d22e9 [automerger skipped] bpfloader: add ability to disable btfloader am: bbab818687 am: 8b6b108865 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2133348

Change-Id: I1fa112613b2fc0229c58bf145a3b678e84d76873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:35:02 +00:00
Maciej Żenczykowski
38b068d821 const-ify mapMatchesExpectations arguments am: 1a7fff3568 am: 9cfd5090df
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132835

Change-Id: If412c2dd71b58c29c8c00209c3c78e9067ccb573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:33:06 +00:00
Maciej Żenczykowski
0333e18c2e Revert "disable bpfloader selinux_context support" am: 687849e52e am: 5fe153224c
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Change-Id: Ic939e69eca6e8d350eac7fa50071d1555d8eaffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:32:51 +00:00
Maciej Żenczykowski
8b6b108865 bpfloader: add ability to disable btfloader am: bbab818687
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2133348

Change-Id: Ifd9eb2b1db1b2c7791847f1609c51b0b335d9b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:15:42 +00:00
Maciej Żenczykowski
9cfd5090df const-ify mapMatchesExpectations arguments am: 1a7fff3568
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132835

Change-Id: I6f3f19dcd603dc691d597337aa3493d2fb201876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:10:13 +00:00
Maciej Żenczykowski
5fe153224c Revert "disable bpfloader selinux_context support" am: 687849e52e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Change-Id: Id23888b14b7003775e6dc469fee8b9510b81ad6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:08:30 +00:00
Android Build Coastguard Worker
82eed90a20 Merge cherrypicks of [19048272] into tm-release.
Change-Id: I5a85c6b087465b678bea7c2564383150b012e983
2022-06-24 02:27:08 +00:00
Maciej Żenczykowski
490a53e6f7 bpfloader: add ability to disable btfloader
BTF support was added to bpfloader during Android T dev cycle.

As it causes bpfloader boot time process to shell out to a new
btfloader subprocess for every bpf.o file with BTF debugging
information compiled in, I'm worried this might have unforeseen
consequences - things like crashes or boot time bpfloader cpu
regressions.

However, BTF is exceedingly useful for debugging,
and it would be a huge pity if we were forced to disable it
and keep it disabled in mainline tethering module just to support
Android T devices for the next 5+ years.

It would also be a pity if the bpf.o files in prebuilt mainline
tethering apex in dev branches (like tm-dev) did not include
BTF debug information simply due to compatibility with older
kernels or OSes, since this would require rebuilding the module
everytime BTF information could be of use.

One of the things functioning BTF enables is 'cat /sys/fs/bpf/map_*'
as root on a userdebug build.  Among other things this can be
used to verify that in kernel bpf map state matches that dumped
by the mainline module's pretty dump code.

Even if there's issues wrt. BTF in Android T (or on older kernels),
we can always fix them in Android U or later (for example build
btfloader into bpfloader to avoid exec overhead, etc...).

Bug: 218408035
Bug: 230585250
Bug: 235559605
Test: TreeHugger, cuttlefish devices boots, and:
  adb root && adb shell cat /sys/fs/bpf/map_time_in_state_cpu_last_pid_map
  continues to show information which is available due to BTF debug provided
  in /system/etc/bpf/time_in_state.o file (due to "btf: true" in Android.bp)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
(cherry picked from commit 37b3d06333)
Merged-In: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
2022-06-24 02:27:00 +00:00
Maciej Żenczykowski
bbab818687 bpfloader: add ability to disable btfloader
BTF support was added to bpfloader during Android T dev cycle.

As it causes bpfloader boot time process to shell out to a new
btfloader subprocess for every bpf.o file with BTF debugging
information compiled in, I'm worried this might have unforeseen
consequences - things like crashes or boot time bpfloader cpu
regressions.

However, BTF is exceedingly useful for debugging,
and it would be a huge pity if we were forced to disable it
and keep it disabled in mainline tethering module just to support
Android T devices for the next 5+ years.

It would also be a pity if the bpf.o files in prebuilt mainline
tethering apex in dev branches (like tm-dev) did not include
BTF debug information simply due to compatibility with older
kernels or OSes, since this would require rebuilding the module
everytime BTF information could be of use.

One of the things functioning BTF enables is 'cat /sys/fs/bpf/map_*'
as root on a userdebug build.  Among other things this can be
used to verify that in kernel bpf map state matches that dumped
by the mainline module's pretty dump code.

Even if there's issues wrt. BTF in Android T (or on older kernels),
we can always fix them in Android U or later (for example build
btfloader into bpfloader to avoid exec overhead, etc...).

Bug: 218408035
Bug: 230585250
Bug: 235559605
Test: TreeHugger, cuttlefish devices boots, and:
  adb root && adb shell cat /sys/fs/bpf/map_time_in_state_cpu_last_pid_map
  continues to show information which is available due to BTF debug provided
  in /system/etc/bpf/time_in_state.o file (due to "btf: true" in Android.bp)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
(cherry picked from commit 37b3d06333)
Merged-In: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
2022-06-23 16:56:49 -07:00
Android Build Coastguard Worker
4153bbe868 Snap for 8762204 from 98ec8cf05b to tm-release
Change-Id: I1bf6b70f175d2692c2ec291b14852e6768c82277
2022-06-23 23:28:14 +00:00
Maciej Żenczykowski
4719f5ffd7 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 04da9002f4 am: 993c827755
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: Ic5899d4a02a652c4a11040bcb157760d1c92f8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:26:31 +00:00
Maciej Żenczykowski
e25a033882 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 04da9002f4 am: cd39f6ed51
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I768f6b23851cbfa75f8f4df8eec1595996dcbf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:18:45 +00:00
Maciej Żenczykowski
63ab4ee2dc bpfloader: add ability to disable btfloader am: 37b3d06333 am: 6571031de6 am: c75ca60443
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I34b309a53e4108355c1290b90c2b23e2ca190689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:18:29 +00:00
Maciej Żenczykowski
993c827755 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 04da9002f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I277addb10abe7c08587099d2e061759dcc1d03a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:11:05 +00:00
Maciej Żenczykowski
cd39f6ed51 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 04da9002f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I12a3799a51a66ad8229c7b2bbebb819049f2e94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:11:00 +00:00
Maciej Żenczykowski
c75ca60443 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 6571031de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I33d1e5924443112ca6c5f11c4b707f0d6f07efa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 23:02:18 +00:00
Maciej Żenczykowski
04da9002f4 bpfloader: add ability to disable btfloader am: 37b3d06333
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I765fe4de6ecccc9d09b1fa901f84a4f0197d2e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 22:45:06 +00:00
Maciej Żenczykowski
6571031de6 bpfloader: add ability to disable btfloader am: 37b3d06333
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I44542df80cbac47f9dd6080cdfab32da0d792986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 22:43:29 +00:00
Maciej Żenczykowski
1a7fff3568 const-ify mapMatchesExpectations arguments
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1364f7d0426c148e7daeb7df0bbfff7ea12c450e
2022-06-23 13:20:45 +00:00
Maciej Żenczykowski
37b3d06333 bpfloader: add ability to disable btfloader
BTF support was added to bpfloader during Android T dev cycle.

As it causes bpfloader boot time process to shell out to a new
btfloader subprocess for every bpf.o file with BTF debugging
information compiled in, I'm worried this might have unforeseen
consequences - things like crashes or boot time bpfloader cpu
regressions.

However, BTF is exceedingly useful for debugging,
and it would be a huge pity if we were forced to disable it
and keep it disabled in mainline tethering module just to support
Android T devices for the next 5+ years.

It would also be a pity if the bpf.o files in prebuilt mainline
tethering apex in dev branches (like tm-dev) did not include
BTF debug information simply due to compatibility with older
kernels or OSes, since this would require rebuilding the module
everytime BTF information could be of use.

One of the things functioning BTF enables is 'cat /sys/fs/bpf/map_*'
as root on a userdebug build.  Among other things this can be
used to verify that in kernel bpf map state matches that dumped
by the mainline module's pretty dump code.

Even if there's issues wrt. BTF in Android T (or on older kernels),
we can always fix them in Android U or later (for example build
btfloader into bpfloader to avoid exec overhead, etc...).

Bug: 218408035
Bug: 230585250
Bug: 235559605
Test: TreeHugger, cuttlefish devices boots, and:
  adb root && adb shell cat /sys/fs/bpf/map_time_in_state_cpu_last_pid_map
  continues to show information which is available due to BTF debug provided
  in /system/etc/bpf/time_in_state.o file (due to "btf: true" in Android.bp)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
2022-06-23 13:08:38 +00:00
Automerger Merge Worker
a8e36247ae Merge "Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218" into tm-d1-dev-plus-aosp am: 91d9fe6bfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I1b0ef50b01c41874ed555f9ba6f6f9cf7b666996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:01:28 +00:00
Maciej Żenczykowski
32220f3de2 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa am: f0764257b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Ie8ed69e85e7cb49a260837d9bbe2154e719a7a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:00:57 +00:00
Maciej Żenczykowski
63d22e6614 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa am: 199963b767
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I88125669904e2f8c837d977518cdc707791b03cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 12:00:38 +00:00
Automerger Merge Worker
91d9fe6bfc Merge "Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218" into tm-d1-dev-plus-aosp 2022-06-23 11:34:26 +00:00
Maciej Żenczykowski
091be8a04d Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Id2af5b061f8dd11697810b410556dc4e81e60857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:34:10 +00:00
Maciej Żenczykowski
f0764257b1 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I34da8e9db23f5a6adb46acf9569325354af39e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:34:09 +00:00
Maciej Żenczykowski
199963b767 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I1867acd3417dd14a71578f8e3dae9ec0055375c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:34:08 +00:00
Maciej Żenczykowski
aa0cd0b2fa Revert "disable bpfloader selinux_context support" am: 98ec8cf05b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I7863520ef21f4fa2d787325637979c2e4737a867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:17:21 +00:00
Maciej Żenczykowski
0a4fb56218 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Ibef2442d3b01614a8ee313485877a7c2b259391d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 11:15:50 +00:00
Android Build Coastguard Worker
6fa2d47076 Snap for 8756258 from a529b323af to tm-release
Change-Id: I5cea18eaccaf9f688137bdb2c16d13aa9333a8e6
2022-06-22 23:27:59 +00:00
Maciej Żenczykowski
98ec8cf05b Revert "disable bpfloader selinux_context support"
This reverts commit 8e5e239dd0a7856e486a9e2d772ef3a9e38021eb.

No longer required now that selinux change has landed.

(while we're at it bump the bpfloader version to v0.19 just
 to make sure we can tell these apart in the future)

This is a cherrypick to tm-dev of reviewed/approved but unsubmitted:
  https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Ignore-AOSP-First: will be cherrypicked to aosp master

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0b3349ef908bbfd225b8b7f83b2a4a8870c1e409
2022-06-22 14:51:58 -07:00
Maciej Żenczykowski
687849e52e Revert "disable bpfloader selinux_context support"
This reverts commit 8e5e239dd0a7856e486a9e2d772ef3a9e38021eb.

No longer required now that selinux change has landed.

(while we're at it bump the bpfloader version to v0.19 just
 to make sure we can tell these apart in the future)

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0b3349ef908bbfd225b8b7f83b2a4a8870c1e409
2022-06-22 19:15:41 +00:00
Automerger Merge Worker
315fbffb3f Merge changes from topic "am-7b00c416034c4104ac885e1f4ac35b8a" into tm-d1-dev-plus-aosp am: 1299dc1ad6 -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a529b323af is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: Idfb5ecbfe0d86d8009e0648a4c9c2f5db7013450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:50 +00:00
Maciej Żenczykowski
e4ced1cd34 [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours am: 395d4dc6f8 -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: I8850d5eadb3116fd384113eb3ae8fc157c993792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:48 +00:00
Maciej Żenczykowski
2879858b30 [automerger skipped] disable bpfloader selinux_context support am: a529b323af -s ours am: 8342a26a24 -s ours am: 016a3e50ab -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: Ifb1c3a43d9fcce20f44e7c8ffa95ac223e75d9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:38 +00:00
Maciej Żenczykowski
7918fef4c3 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a -s ours am: 005e8a84e7 -s ours am: baec5c62ee -s ours
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I588f67f810c4ebe946a576dd2dc51caa10eebed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:37 +00:00
Maciej Żenczykowski
568508c3cb [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b am: cf82d2ae6b -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: I49f50732dddce6689616356fdd571d4cc71a0e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:23 +00:00
Maciej Żenczykowski
43581c60b0 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 am: b5c55e9e4b -s ours
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I4a4a433c7cde7071a506c9781b35210fc2c7d5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:26:22 +00:00
Maciej Żenczykowski
cf82d2ae6b disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: I9f2afcea7a8425ef557b943b94ed04d53ca13a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:09:50 +00:00
Maciej Żenczykowski
b5c55e9e4b bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I02ef9485d0dff36e1dbd070aec547bb42c7b8526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:09:49 +00:00
Automerger Merge Worker
1299dc1ad6 Merge changes from topic "am-7b00c416034c4104ac885e1f4ac35b8a" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours
  [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 -s ours
2022-06-22 03:09:39 +00:00
Maciej Żenczykowski
395d4dc6f8 [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: I62e4b45a2b88e58eed6238f051caa4e3962a0e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:09:35 +00:00
Maciej Żenczykowski
9319ed5e25 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 -s ours
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I7449f8b9d719e4ed4eb5fa975ab1abbea128681f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:09:34 +00:00
Maciej Żenczykowski
016a3e50ab [automerger skipped] disable bpfloader selinux_context support am: a529b323af -s ours am: 8342a26a24 -s ours
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: Ic70037a04eb9ee4f6afae77c497830819b9925c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 03:09:31 +00:00