Commit graph

2052 commits

Author SHA1 Message Date
Maciej Żenczykowski
c04c69fed3 bpfloader: Android V requires kernel 4.19+ am: 6002cbedb1 am: abc8303ffe am: 5070df963d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2657155

Change-Id: Ia093479ee3bc550c4c800546bb40d9cfac0a5f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 19:09:16 +00:00
Maciej Żenczykowski
5070df963d bpfloader: Android V requires kernel 4.19+ am: 6002cbedb1 am: abc8303ffe
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2657155

Change-Id: Ibfc41f968349a094584cc69fc13d25f97d643a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:23:53 +00:00
Maciej Żenczykowski
abc8303ffe bpfloader: Android V requires kernel 4.19+ am: 6002cbedb1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2657155

Change-Id: I08ab8fd9601ddeff20a4651b101f67f17ede15be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:55:50 +00:00
Maciej Żenczykowski
6002cbedb1 bpfloader: Android V requires kernel 4.19+
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibd9ad9bc322388f0f5eda75f9e838590f713007c
2023-07-13 18:45:16 +00:00
Maciej Żenczykowski
bfb38761fd add a comment about page size vs bpf ring buffer sizing am: 28f01bb027 am: cd4022ef2a am: 9045516e4a am: e5a0a70b78
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: I0ddd683e98133e61a0105595aceb94c7411e1b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:54:07 +00:00
Maciej Żenczykowski
e5a0a70b78 add a comment about page size vs bpf ring buffer sizing am: 28f01bb027 am: cd4022ef2a am: 9045516e4a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: I199fcd4d8b2db4b26a93294e155edcc7a5696633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:08:28 +00:00
Maciej Żenczykowski
9045516e4a add a comment about page size vs bpf ring buffer sizing am: 28f01bb027 am: cd4022ef2a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: Iaf03968f3f930e6e1dc372468b77e82162ba5483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 08:19:31 +00:00
Maciej Żenczykowski
cd4022ef2a add a comment about page size vs bpf ring buffer sizing am: 28f01bb027
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: Icd169c9f37692b2acfadd895e0b01ea4315cf830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:37:27 +00:00
Maciej Żenczykowski
3c37c62ca3 bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b am: 1cba4021bf am: f9ff12af51 am: a284f6434e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: I278ad206e3025f15b56178270959307b9a287c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 22:42:43 +00:00
Maciej Żenczykowski
a284f6434e bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b am: 1cba4021bf am: f9ff12af51
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: If461fcd3618862d696d38dd7b048bb5ed7fddadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:56:44 +00:00
Maciej Żenczykowski
f9ff12af51 bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b am: 1cba4021bf
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: I399a67cb7cb058b5b690839adbcddfa7420d4da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:09:52 +00:00
Maciej Żenczykowski
1cba4021bf bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: I235578e8c2f6a715e6857d1d713dc362371d0c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:26:33 +00:00
Maciej Żenczykowski
28f01bb027 add a comment about page size vs bpf ring buffer sizing
As requested by Patrick on:
https://android-review.git.corp.google.com/c/platform/system/bpf/+/2628969
bpfLoader: automatically bump ringbuffer size up to page size

Test: N/A, comment only
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibbce6a72e5e25bf18bb89bca2f00d332ef824f73
2023-06-20 19:40:57 +00:00
Maciej Żenczykowski
8a117a374b bpfLoader: automatically bump ringbuffer size up to page size
A 4kB BPF_MAP_TYPE_RINGBUF does not work on 16kB page size kernel,
as an eBPF ring buffer size *must* be a multiple of the page size.

However, it is inefficient to force a 16kB RINGBUF on kernels
with only a 4kB page size.

It wastes 12kB of mlock'ed memory per ring buffer,
which isn't much, but - as we add more ringbuffers - it'll add up...

The userspace ring buffer code doesn't actually mind the
automatic increase in size, as it retrieves the actual
size from the map fd (ie. from the kernel) during init
and thus adjusts automatically.

Test: TreeHugger
Bug: 279819914
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9fcb1f9dc2e86038a7f1a486f4efbc28dba38ca0
2023-06-17 11:15:56 +00:00
Evgenii Stepanov
43044a25d1 [automerger skipped] [NFC] Move MTE mode settings to a product variable. am: b895507094 -s ours
am skip reason: Merged-In I7b2713fa0065f8c0317cc7634eedf6143f7fefec with SHA-1 d26716e148 is already in history

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

Change-Id: Ib28f1891d6c72790555d970adc27277c11f95e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 06:52:55 +00:00
Evgenii Stepanov
b895507094 [NFC] Move MTE mode settings to a product variable.
The default list of memtag targets found in
  build/make/target/product/memtag-common.mk

Bug: 280343521
Test: no functional change
Merged-In: I7b2713fa0065f8c0317cc7634eedf6143f7fefec
Change-Id: I7b2713fa0065f8c0317cc7634eedf6143f7fefec
(cherry picked from commit d26716e148)
2023-06-15 15:26:21 -07:00
Maciej Żenczykowski
1dbccf0735 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8 am: b2d58eaf96 am: 266e04dca3 am: f7dba12a41
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: I81b39dcc022b32c9ae82c6f2aa4463d54f12eb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 11:43:23 +00:00
Maciej Żenczykowski
f7dba12a41 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8 am: b2d58eaf96 am: 266e04dca3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: Ife08c641b83866b419c83eef0253c0942872da09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 11:01:49 +00:00
Maciej Żenczykowski
266e04dca3 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8 am: b2d58eaf96
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: I8166321dd11446102bac04121f4da8b3a8381528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:11:05 +00:00
Maciej Żenczykowski
b2d58eaf96 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: I7d77dc444f276b0c676844c0a57c84750bd0dda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 09:06:00 +00:00
Maciej Żenczykowski
c93af9eec8 Merge "BpfLoader - allow disabling BTF loading on user builds only" 2023-06-15 08:16:49 +00:00
Evgenii Stepanov
8f80d0032b [NFC] Move MTE mode settings to a product variable. am: d26716e148 am: da6d9177a3 am: 1e882deded am: deb813c18b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: Ia74a066287f539d6668fa4e2dc0cb964a5880fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 03:57:48 +00:00
Evgenii Stepanov
deb813c18b [NFC] Move MTE mode settings to a product variable. am: d26716e148 am: da6d9177a3 am: 1e882deded
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I68d1d8d204b31c591abefb9b0a4689c5772b995d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 02:27:44 +00:00
Evgenii Stepanov
1e882deded [NFC] Move MTE mode settings to a product variable. am: d26716e148 am: da6d9177a3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I17eaf29fb5203ed67ac9f8b6a67838d609541567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:40:36 +00:00
Evgenii Stepanov
da6d9177a3 [NFC] Move MTE mode settings to a product variable. am: d26716e148
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I20cc37a38ad12f95192a86d6619de77702a652ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 00:31:39 +00:00
Evgenii Stepanov
d26716e148 [NFC] Move MTE mode settings to a product variable.
The default list of memtag targets found in
  build/make/target/product/memtag-common.mk

Bug: 280343521
Test: no functional change
Change-Id: I7b2713fa0065f8c0317cc7634eedf6143f7fefec
2023-06-12 16:58:02 -07:00
Maciej Żenczykowski
411e3f07f7 BpfLoader - allow disabling BTF loading on user builds only
In some programs BTF information may be useful only for debugging.

Bug: 286369326
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iebe8897520d0e37196e33ee3c65691708050508d
2023-06-09 05:58:47 +00:00
Maciej Żenczykowski
d1e2826278 [automerger skipped] bpfloader: ignore_on_arch support am: 53ed03bc3b -s ours am: 7f08952a4b -s ours
am skip reason: Merged-In I572fd18b2c778fa67073a5410dcb2410e5c24ff5 with SHA-1 8d2e7d9ae3 is already in history

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

Change-Id: Ie4a6c157777b3809ea9cb5a4256b98fed5545010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 10:09:26 +00:00
Maciej Żenczykowski
84c3fd42ec [automerger skipped] bpfloader: ignore_on_arch support am: 53ed03bc3b am: cc389dd8ca -s ours
am skip reason: Merged-In I572fd18b2c778fa67073a5410dcb2410e5c24ff5 with SHA-1 8d2e7d9ae3 is already in history

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

Change-Id: I6240334e85c4aed2fccadbaef52375e937416535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 10:05:45 +00:00
Maciej Żenczykowski
cc389dd8ca bpfloader: ignore_on_arch support am: 53ed03bc3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23391173

Change-Id: Ieb4944e49f107fde85b8ce75fa79ae1bf71eda2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 09:24:23 +00:00
Maciej Żenczykowski
7f08952a4b [automerger skipped] bpfloader: ignore_on_arch support am: 53ed03bc3b -s ours
am skip reason: Merged-In I572fd18b2c778fa67073a5410dcb2410e5c24ff5 with SHA-1 8d2e7d9ae3 is already in history

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

Change-Id: Iefacbd23dc042fa4b11a461375e1c36b94b61565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 09:18:24 +00:00
Maciej Żenczykowski
53ed03bc3b bpfloader: ignore_on_arch support
Test: TreeHugger
Bug: 283523051
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:8d2e7d9ae3ebc34f8ab5f54ad0e3008c4a80b76d)
Merged-In: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
Change-Id: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
Bug: 283523051
2023-05-23 16:14:49 +00:00
Maciej Żenczykowski
40500bdb7e bpfloader: ignore_on_arch support am: 8d2e7d9ae3 am: 0edf3d92a9 am: de2ff678a2 am: a68c249564
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: I14987db9cb86ab230f1450294e150701fdab57ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 18:45:14 +00:00
Maciej Żenczykowski
a68c249564 bpfloader: ignore_on_arch support am: 8d2e7d9ae3 am: 0edf3d92a9 am: de2ff678a2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: I316d792259ce1f7abe757624cd0411e97b7fdb8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 18:16:33 +00:00
Maciej Żenczykowski
de2ff678a2 bpfloader: ignore_on_arch support am: 8d2e7d9ae3 am: 0edf3d92a9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: I0b5ea92ad2e8618ba748e8f6feadef853f6c7c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 17:22:54 +00:00
Maciej Żenczykowski
0edf3d92a9 bpfloader: ignore_on_arch support am: 8d2e7d9ae3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: Ie93f545aa4b9fd30048806490c46e6585c99a24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 16:30:39 +00:00
Maciej Żenczykowski
8d2e7d9ae3 bpfloader: ignore_on_arch support
Test: TreeHugger
Bug: 283523051
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
2023-05-20 02:07:17 +00:00
Maciej Żenczykowski
d37052a360 [automerger skipped] remove inprocess tethering am: e15e91ea0d am: 72bc068da9 am: 2a6a6f7b5b -s ours am: 4650ef2248 -s ours
am skip reason: Merged-In If7c3ca47891d53f478f7b784580efb2a0014c617 with SHA-1 48cd823681 is already in history

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

Change-Id: I0088b3da2773e3441ece6490e0714d82a74e1e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 20:26:48 +00:00
Maciej Żenczykowski
4650ef2248 [automerger skipped] remove inprocess tethering am: e15e91ea0d am: 72bc068da9 am: 2a6a6f7b5b -s ours
am skip reason: Merged-In If7c3ca47891d53f478f7b784580efb2a0014c617 with SHA-1 48cd823681 is already in history

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

Change-Id: Ic238f889161c525d9e73a55512194d6f2ab76aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 19:42:20 +00:00
Maciej Żenczykowski
2a6a6f7b5b remove inprocess tethering am: e15e91ea0d am: 72bc068da9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2589605

Change-Id: If6a10bb2bcb2d877d97e05a0379d5596b6b6f065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 18:37:06 +00:00
Maciej Żenczykowski
72bc068da9 remove inprocess tethering am: e15e91ea0d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2589605

Change-Id: I0f5fe75cf3d1141684b8852ebd316630c93acce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 17:57:40 +00:00
Maciej Żenczykowski
e15e91ea0d remove inprocess tethering
The logic dealing with in vs out-of-process tethering flags
was added in aosp/master once it was already not merging to tm-dev,
thus ending up only in udc-dev, it was later removed in aosp/master,
and then cherrypicked to udc-dev.

As such there is no shipping version of the bpfloader
(besides early U developer previews and betas)
with this requirement.

Ignore-AOSP-First: change must land in U first,
since it's not safe if it isn't approved for udc-dev

Test: TreeHugger
Bug: 279942846
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48cd8236816ef8d29002fb0c7c66ff480fa3a396)
Merged-In: If7c3ca47891d53f478f7b784580efb2a0014c617
Change-Id: If7c3ca47891d53f478f7b784580efb2a0014c617
2023-05-15 16:32:32 +00:00
Maciej Żenczykowski
7da12f9f1d remove inprocess tethering am: 48cd823681 am: 2c2b3d9e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: Ic25e0d43790582b9c9361c62a4ea792fa01ced21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 02:17:57 +00:00
Maciej Żenczykowski
ae366ac3fe remove inprocess tethering am: 48cd823681 am: 8dce22ac34
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: I72a06ec8e6de8fbe7bf3d5170fd3486c8ec59fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 02:13:50 +00:00
Maciej Żenczykowski
8dce22ac34 remove inprocess tethering am: 48cd823681
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: I03c1f43116a77fb6000904d79948b9a803fd5545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 01:37:32 +00:00
Maciej Żenczykowski
2c2b3d9e59 remove inprocess tethering am: 48cd823681
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: I446901ec4c0e78f6b9d44935f29d56dd786dafae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 01:33:21 +00:00
Maciej Żenczykowski
48cd823681 remove inprocess tethering
The logic dealing with in vs out-of-process tethering flags
was added in aosp/master once it was already not merging to tm-dev,
thus ending up only in udc-dev, it was later removed in aosp/master,
and then cherrypicked to udc-dev.

As such there is no shipping version of the bpfloader
(besides early U developer previews and betas)
with this requirement.

Ignore-AOSP-First: change must land in U first,
since it's not safe if it isn't approved for udc-dev

Test: TreeHugger
Bug: 279942846
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If7c3ca47891d53f478f7b784580efb2a0014c617
2023-05-13 01:04:44 +00:00
Maciej Żenczykowski
ec571ac0b0 [automerger skipped] remove inprocess tethering am: c718d008d8 -s ours am: a2588c95ac -s ours
am skip reason: Merged-In I381345cee7431d8e41918870155db4a6a8de7e5b with SHA-1 bca197ccab is already in history

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

Change-Id: Ia19daff48c25e72245b38bb98b7a3262443b2bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:15:06 +00:00
Maciej Żenczykowski
ef4b5c9f2a [automerger skipped] remove inprocess tethering am: c718d008d8 am: 4a9fb81a05 -s ours
am skip reason: Merged-In I381345cee7431d8e41918870155db4a6a8de7e5b with SHA-1 bca197ccab is already in history

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

Change-Id: Ibce27cce9bd35f27f68305b77686937ee84efd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:12:15 +00:00
Maciej Żenczykowski
a2588c95ac [automerger skipped] remove inprocess tethering am: c718d008d8 -s ours
am skip reason: Merged-In I381345cee7431d8e41918870155db4a6a8de7e5b with SHA-1 bca197ccab is already in history

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

Change-Id: Ic76c7e5671611a2bacd85ab910c9455175502f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:09:38 +00:00