From 200d372dc9c023c3fec69d260305f0079be8944b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 15 Jun 2022 01:06:27 -0700 Subject: [PATCH] move XtBpfProgLocations.h into a new header library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 235778483 Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ia5e3c72e65cee17ef67907008d8fe6d4e47050de --- bpf_progs/Android.bp | 4 ++-- bpf_progs/bpf_shared.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp index b1144b4296..78fca29262 100644 --- a/bpf_progs/Android.bp +++ b/bpf_progs/Android.bp @@ -27,11 +27,11 @@ cc_library_headers { host_supported: false, header_libs: [ "bpf_headers", - "libnetdbinder_utils_headers", // for XtBpfProgLocations.h + "netd_mainline_headers", ], export_header_lib_headers: [ "bpf_headers", - "libnetdbinder_utils_headers", // for XtBpfProgLocations.h + "netd_mainline_headers", ], export_include_dirs: ["."], cflags: [ diff --git a/bpf_progs/bpf_shared.h b/bpf_progs/bpf_shared.h index 05562530f7..c4effa6888 100644 --- a/bpf_progs/bpf_shared.h +++ b/bpf_progs/bpf_shared.h @@ -116,7 +116,7 @@ static const int UID_OWNER_MAP_SIZE = 2000; /* -=-=-=-=- WARNING -=-=-=-=- * * These 4 xt_bpf program paths are actually defined by: - * //system/netd/include/binder_utils/XtBpfProgLocations.h + * //system/netd/include/mainline/XtBpfProgLocations.h * which is intentionally a non-automerged location. * * They are *UNCHANGEABLE* due to being hard coded in Android T's netd binary