commit 70201a11db2246d2fc55f18305621dadde6f0079
author Maciej Żenczykowski <maze@google.com> Wed Jun 15 01:06:27 2022 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Jun 16 03:19:19 2022 +0000
tree cda506d8572cb1745f5f5e40ecca6a7a93c440dd
parent ebec0f76ce9705d033034231e8d12d3a0618bdf4

move XtBpfProgLocations.h into a new header library

Bug: 235778483
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia5e3c72e65cee17ef67907008d8fe6d4e47050de
(cherry picked from commit 200d372dc9c023c3fec69d260305f0079be8944b)
Merged-In: Ia5e3c72e65cee17ef67907008d8fe6d4e47050de

bpf_progs/Android.bp

diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp
index 302cf60..45cb7eb 100644
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -27,11 +27,11 @@
     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: [

bpf_progs/bpf_shared.h

diff --git a/bpf_progs/bpf_shared.h b/bpf_progs/bpf_shared.h
index 0556253..c4effa6 100644
--- a/bpf_progs/bpf_shared.h
+++ b/bpf_progs/bpf_shared.h
@@ -116,7 +116,7 @@
 /* -=-=-=-=- 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