| commit | f8c4ee4148f787a1324e4f251b95cde24d41bba2 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Aug 16 03:30:24 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 03:30:24 2024 +0000 |
| tree | 5d10f8daaf05ca3a0bdcad735c73236c52504cca | |
| parent | 15b2d55398556790a43a8bfdc71738b935433035 [diff] | |
| parent | fec6f7792d9175201a6e1b13e3c8d38ff6c07287 [diff] |
bpf: change AOSP/MASTER to AOSP/MAIN am: 401c98f127 am: fec6f7792d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3221265 Change-Id: I6afd4c32afd0d05d5a8d1a1aec0eadea65a9b83f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h index 4ddec8b..e7da0fe 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -7,7 +7,7 @@ #include "bpf_map_def.h" /****************************************************************************** - * WARNING: CHANGES TO THIS FILE OUTSIDE OF AOSP/MASTER ARE LIKELY TO BREAK * + * WARNING: CHANGES TO THIS FILE OUTSIDE OF AOSP/MAIN ARE LIKELY TO BREAK * * DEVICE COMPATIBILITY WITH MAINLINE MODULES SHIPPING EBPF CODE. * * * * THIS WILL LIKELY RESULT IN BRICKED DEVICES AT SOME ARBITRARY FUTURE TIME *
diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h b/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h index 00ef91a..8ccf5dc 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h
@@ -29,7 +29,7 @@ * * * ! ! ! W A R N I N G ! ! ! * * * - * CHANGES TO THESE STRUCTURE DEFINITIONS OUTSIDE OF AOSP/MASTER *WILL* BREAK * + * CHANGES TO THESE STRUCTURE DEFINITIONS OUTSIDE OF AOSP/MAIN *WILL* BREAK * * MAINLINE MODULE COMPATIBILITY * * * * AND THUS MAY RESULT IN YOUR DEVICE BRICKING AT SOME ARBITRARY POINT IN *