tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1786 commits 1 branch 0 tags 1.8 MiB
Commit graph

1786 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maciej Żenczykowski
04b51e9d64 [automerger skipped] remove spurious newlines in ALOG lines am: 72c3298572 -s ours 
am skip reason: Merged-In I2d75f1702c02b72c298642beb62c5df1c2629367 with SHA-1 e626a95e2f is already in history

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

Change-Id: I12eea3bc4bc931d6f1b14489ff4327d96d2ef325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:00:30 +00:00
Maciej Żenczykowski
81f88cfc8f [automerger skipped] bpfloader: add support for perf_event program type am: 1d018c1655 -s ours 
am skip reason: Merged-In I79a5b084b80a1c423d555d9b63b08f9cd00fa684 with SHA-1 e092e0bbfe is already in history

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

Change-Id: I4a9e6c40b5a90459009c15cc16ee5ae5f687a37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:00:27 +00:00
Maciej Żenczykowski
8482e88f9e bpfLoader: verify that reused maps are the right type & shape 
This is needed to make it safe to share maps across different .o's.

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9e8a5893ed4f91354f6544be587b10a97d179de6
(cherry picked from commit 12bb520707)
Merged-In: I9e8a5893ed4f91354f6544be587b10a97d179de6
 2022-06-20 17:46:48 +00:00
Maciej Żenczykowski
14fdd0a4a9 add support for 'netd_readonly' 
For use by:
- maps netd should have read but not write access to
  (needed due to netd being root with DAC_OVERRIDE,
   and thus not obeying standard unix permissions)
- programs that netd should have access to but
  not netutils_wrappers (which due to being able to
  run iptables, needs access to xt_bpf programs)

Bug: 218408035
Test: booted on cuttlefish
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I72b106692a25077ff54252fd93db81f46b52125d
(cherry picked from commit 32c0b8f46e)
Merged-In: I72b106692a25077ff54252fd93db81f46b52125d
 2022-06-20 16:32:18 +00:00
Maciej Żenczykowski
72c3298572 remove spurious newlines in ALOG lines 
eliminates empty lines visible in cuttlefish kernel.log

Bug: 218408035
Test: booted on cuttlefish
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2d75f1702c02b72c298642beb62c5df1c2629367
(cherry picked from commit e626a95e2f)
Merged-In: I2d75f1702c02b72c298642beb62c5df1c2629367
 2022-06-20 16:27:40 +00:00
Maciej Żenczykowski
1d018c1655 bpfloader: add support for perf_event program type 
Based on
  https://android-review.googlesource.com/c/platform/system/bpf/+/2104448

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I79a5b084b80a1c423d555d9b63b08f9cd00fa684
(cherry picked from commit e092e0bbfe)
Merged-In: I79a5b084b80a1c423d555d9b63b08f9cd00fa684
 2022-06-20 16:26:47 +00:00
Maciej Żenczykowski
1e7776e235 bpfLoader: verify that reused maps are the right type & shape am: 12bb520707 am: efd19a30fd am: 7d3192bae4 am: 5830a2a503 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127664

Change-Id: I04bdfadd35ece048f48766db12e2c917ebecbccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 10:54:00 +00:00
Maciej Żenczykowski
5830a2a503 bpfLoader: verify that reused maps are the right type & shape am: 12bb520707 am: efd19a30fd am: 7d3192bae4 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127664

Change-Id: I7896514f1c082febb551aebd30174aecfebcd79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 10:27:50 +00:00
Maciej Żenczykowski
7d3192bae4 bpfLoader: verify that reused maps are the right type & shape am: 12bb520707 am: efd19a30fd 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127664

Change-Id: Ica67e807eb419f182122231c97175210b5888c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 10:10:17 +00:00
Maciej Żenczykowski
efd19a30fd bpfLoader: verify that reused maps are the right type & shape am: 12bb520707 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127664

Change-Id: Ia3aba46329f94083a5f7660159526075264c89ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 09:48:55 +00:00
Maciej Żenczykowski
5e02aa2149 add support for 'netd_readonly' am: 32c0b8f46e am: de19a0d3fe am: ad3780016d am: 901c7b5d29 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127666

Change-Id: I5be71998de7a1ee6e24d9c4e9855aeacbe9d311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 09:06:14 +00:00
Maciej Żenczykowski
41c5e1b66c remove spurious newlines in ALOG lines am: e626a95e2f am: b9f573a9ec am: 55d6c92fa4 am: acad02a106 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127667

Change-Id: I54869c90cfabe89301a7e49ab622a1c9fb76c25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 09:05:55 +00:00
Maciej Żenczykowski
901c7b5d29 add support for 'netd_readonly' am: 32c0b8f46e am: de19a0d3fe am: ad3780016d 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127666

Change-Id: Ie992e57e0e715848ae9b489436ebdc4ed1fa4641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:51:04 +00:00
Maciej Żenczykowski
acad02a106 remove spurious newlines in ALOG lines am: e626a95e2f am: b9f573a9ec am: 55d6c92fa4 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127667

Change-Id: Ic42e06ee6ca1c0dc3e082f43c85decafb97a6f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:50:56 +00:00
Maciej Żenczykowski
ad3780016d add support for 'netd_readonly' am: 32c0b8f46e am: de19a0d3fe 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127666

Change-Id: I54e1d186564bad92f19a5b246574ce0950495057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:27:08 +00:00
Maciej Żenczykowski
55d6c92fa4 remove spurious newlines in ALOG lines am: e626a95e2f am: b9f573a9ec 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127667

Change-Id: Ie19c931885f39d6f93cfe566c3d1fe56989653e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:26:59 +00:00
Maciej Żenczykowski
de19a0d3fe add support for 'netd_readonly' am: 32c0b8f46e 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127666

Change-Id: I506eb93db0741343b307713f016733be38796d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:09:37 +00:00
Maciej Żenczykowski
b9f573a9ec remove spurious newlines in ALOG lines am: e626a95e2f 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2127667

Change-Id: I75d6ab98035f6f8f9acd12582f9b0119e400c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:09:13 +00:00
Maciej Żenczykowski
12bb520707 bpfLoader: verify that reused maps are the right type & shape 
This is needed to make it safe to share maps across different .o's.

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9e8a5893ed4f91354f6544be587b10a97d179de6
 2022-06-18 00:33:31 -07:00
Maciej Żenczykowski
32c0b8f46e add support for 'netd_readonly' 
For use by:
- maps netd should have read but not write access to
  (needed due to netd being root with DAC_OVERRIDE,
   and thus not obeying standard unix permissions)
- programs that netd should have access to but
  not netutils_wrappers (which due to being able to
  run iptables, needs access to xt_bpf programs)

Bug: 218408035
Test: booted on cuttlefish
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I72b106692a25077ff54252fd93db81f46b52125d
 2022-06-17 18:08:00 -07:00
Maciej Żenczykowski
e626a95e2f remove spurious newlines in ALOG lines 
eliminates empty lines visible in cuttlefish kernel.log

Bug: 218408035
Test: booted on cuttlefish
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2d75f1702c02b72c298642beb62c5df1c2629367
 2022-06-17 18:07:00 -07:00
Maciej Żenczykowski
9a4e778887 bpfloader: add support for perf_event program type am: e092e0bbfe am: 37a08f76db am: fe11460f0d am: ceb49ba859 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2104864

Change-Id: I49ce9e0517a25f48322813ffc804d375856fcb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 05:54:34 +00:00
Maciej Żenczykowski
ceb49ba859 bpfloader: add support for perf_event program type am: e092e0bbfe am: 37a08f76db am: fe11460f0d 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2104864

Change-Id: I3d6521c2acb5bc6e21baa99c556157d39d123f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 05:38:50 +00:00
Maciej Żenczykowski
fe11460f0d bpfloader: add support for perf_event program type am: e092e0bbfe am: 37a08f76db 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2104864

Change-Id: I66c285c812a5ec267d468a6ca630c6abf2a2f858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 05:19:58 +00:00
Maciej Żenczykowski
37a08f76db bpfloader: add support for perf_event program type am: e092e0bbfe 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2104864

Change-Id: Id91f99948382bcd529f336b319f4de451dcecec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 05:00:59 +00:00
Android Build Coastguard Worker
bd937359c8 Snap for 8637088 from af617ca0aa to tm-release 
Change-Id: I6b552e088c816ba32fce304879ef2fcc7ad79eaa
 2022-05-24 23:28:31 +00:00
Automerger Merge Worker
34a590aa51 Merge "[automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa -s ours am: 221fca4c00 -s ours" into tm-d1-dev-plus-aosp am: 87aaf4a1d0 -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 af617ca0aa is already in history

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

Change-Id: I58fa35c2aaa207981c8647bf00e913f2b817da87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:36:51 +00:00
Maciej Żenczykowski
4f8bd89282 [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa -s ours am: 221fca4c00 -s ours am: 3e7e1ad696 -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: Ia0e7e20bd09b3801e70ff00b5f881992a5598e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:36:50 +00:00
Maciej Żenczykowski
7213b748e3 [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa am: 42aba801c2 -s ours am: 4f7bf8abca -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: I56a6e5f5b22dd9398c950d16854be33b755616f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:36:40 +00:00
Maciej Żenczykowski
a179992bfe [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa am: 42aba801c2 am: 36ce834f81 -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: I3b0c5c9a685b8c09801f80771f2a92476ccca477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:36:06 +00:00
Maciej Żenczykowski
e092e0bbfe bpfloader: add support for perf_event program type 
Based on
  https://android-review.googlesource.com/c/platform/system/bpf/+/2104448

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I79a5b084b80a1c423d555d9b63b08f9cd00fa684
 2022-05-24 13:14:56 +00:00
Maciej Żenczykowski
36ce834f81 ease debugging - print pinned bpf prog & map ids am: af617ca0aa am: 42aba801c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/18574602

Change-Id: I0086bac16ae04508624fc8d983d1c54fd009f0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:03:15 +00:00
Automerger Merge Worker
87aaf4a1d0 Merge "[automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa -s ours am: 221fca4c00 -s ours" into tm-d1-dev-plus-aosp 2022-05-24 13:03:05 +00:00
Maciej Żenczykowski
3e7e1ad696 [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa -s ours am: 221fca4c00 -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: I68630a6c0cc9768bea3c7c293165e9be2a5bd239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:02:59 +00:00
Maciej Żenczykowski
4f7bf8abca [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa am: 42aba801c2 -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: I704194134fa715f5600299c963aea5640f997bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:02:59 +00:00
Maciej Żenczykowski
42aba801c2 ease debugging - print pinned bpf prog & map ids am: af617ca0aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/18574602

Change-Id: I55e7a90f9bd5825f6252674b09ee03d3553f6505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:45:38 +00:00
Maciej Żenczykowski
221fca4c00 [automerger skipped] ease debugging - print pinned bpf prog & map ids am: af617ca0aa -s ours 
am skip reason: Merged-In I66c7fa12d079257486569105368bf1eea2d3ab0c with SHA-1 57412c2a27 is already in history

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

Change-Id: I338095f288c97abf16f181d04ae52591ce9842b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:43:55 +00:00
Maciej Żenczykowski
af617ca0aa ease debugging - print pinned bpf prog & map ids 
combined with content of /proc/${pid}/fd/${fd}
and /proc/${pid}/fdinfo/${fd} this allows figuring
out which programs/maps a process continues to
have open

See:
  adbz logcat -d | egrep '(map|prog) .* id'
  adbz root
  adbz_bpf_progs_and_maps

Bug: 230880517
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I66c7fa12d079257486569105368bf1eea2d3ab0c
(cherry picked from commit 57412c2a27)
Merged-In: I66c7fa12d079257486569105368bf1eea2d3ab0c
 2022-05-24 09:25:58 +00:00
Maciej Żenczykowski
dcf86eb680 ease debugging - print pinned bpf prog & map ids am: 57412c2a27 am: 665c49f370 am: 18e62eb9c0 am: 703e8401a6 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2103404

Change-Id: I07927d52579a817e1b261841fe2504ea10105f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 22:16:33 +00:00
Maciej Żenczykowski
703e8401a6 ease debugging - print pinned bpf prog & map ids am: 57412c2a27 am: 665c49f370 am: 18e62eb9c0 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2103404

Change-Id: I525185ae4c6a917f76b5fe9fe503470c6fc6ee9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:30:51 +00:00
Maciej Żenczykowski
18e62eb9c0 ease debugging - print pinned bpf prog & map ids am: 57412c2a27 am: 665c49f370 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2103404

Change-Id: Ifcdff47ee0f9b7b32e5ffe936221caf0ace5d1e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:10 +00:00
Maciej Żenczykowski
665c49f370 ease debugging - print pinned bpf prog & map ids am: 57412c2a27 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2103404

Change-Id: I86e49b350ab0bb5c0db770bafbc09067a60001e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:29:42 +00:00
Maciej Żenczykowski
57412c2a27 ease debugging - print pinned bpf prog & map ids 
combined with content of /proc/${pid}/fd/${fd}
and /proc/${pid}/fdinfo/${fd} this allows figuring
out which programs/maps a process continues to
have open

See:
  adbz logcat -d | egrep '(map|prog) .* id'
  adbz root
  adbz_bpf_progs_and_maps

Bug: 230880517
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I66c7fa12d079257486569105368bf1eea2d3ab0c
 2022-05-20 17:20:36 -07:00
Android Build Coastguard Worker
6e63ba776f Snap for 8581162 from 4dfce18208 to tm-release 
Change-Id: Iba69be78732816f174c06d303ecb9c0056c01fbb
 2022-05-12 23:10:17 +00:00
Automerger Merge Worker
ac158c38b1 Merge "[automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 am: bb3c5a81ea -s ours" into tm-d1-dev-plus-aosp am: b9379c4b17 -s ours 
am skip reason: Merged-In I613b84342fba7b425fb10af157fe0a6a731b71cb with SHA-1 4dfce18208 is already in history

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

Change-Id: I59ed42b4ce0ac107542f79a0965161d69bb5988f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 14:52:24 +00:00
Maciej Żenczykowski
7539515e5a [automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 am: bb3c5a81ea -s ours am: 2ae3296aaf -s ours 
am skip reason: Merged-In I613b84342fba7b425fb10af157fe0a6a731b71cb with SHA-1 7acf938127 is already in history

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

Change-Id: If3775340de51c9c0342a8ee12db882e378322ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 14:52:23 +00:00
Maciej Żenczykowski
d8e7326a66 [automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 -s ours am: ea0aa8c0aa -s ours am: cd66cf0b87 -s ours 
am skip reason: Merged-In I613b84342fba7b425fb10af157fe0a6a731b71cb with SHA-1 7acf938127 is already in history

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

Change-Id: Ie03258ff69710f2ea84fe53cf0158d203a08d277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 14:52:05 +00:00
Maciej Żenczykowski
52b3789a88 [automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 am: bb3c5a81ea am: 7ca01428e1 -s ours 
am skip reason: Merged-In I613b84342fba7b425fb10af157fe0a6a731b71cb with SHA-1 7acf938127 is already in history

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

Change-Id: I12385b8ded2a9eeb0f307812682573943ba7c648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 14:51:28 +00:00
Automerger Merge Worker
b9379c4b17 Merge "[automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 am: bb3c5a81ea -s ours" into tm-d1-dev-plus-aosp 2022-05-12 14:18:56 +00:00
Maciej Żenczykowski
2ae3296aaf [automerger skipped] bpfloader: add support for netd_shared and net_private subdirs am: 4dfce18208 am: bb3c5a81ea -s ours 
am skip reason: Merged-In I613b84342fba7b425fb10af157fe0a6a731b71cb with SHA-1 7acf938127 is already in history

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

Change-Id: I375bcf50db231aea34a0d38771f7159c6898362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 14:18:54 +00:00