From 401c98f12759c4254c4c4ecbb1d2a9115eba7091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 15 Aug 2024 14:55:05 -0700 Subject: [PATCH] bpf: change AOSP/MASTER to AOSP/MAIN Change-Id: I31033b15d845ecc9a19958a1a324885977ac8147 --- staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h | 2 +- staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h index 4ddec8bcd5..e7da0fe699 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 00ef91a203..8ccf5dc73e 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 *