commit 1387399d619ce731d9e4ae31ff071818ad99b2af
author Maciej Żenczykowski <maze@google.com> Mon Jan 24 19:14:35 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 24 19:14:35 2022 +0000
tree f3d4d64500405c578828df8134c0ccbe83350303
parent 1c965450f8ed09a0bc54fec6f9e45e761407a90b
parent 4a1e6023c4933a7d9d7aab375e36549e9ef42266

Merge changes from topic "configure_bpf_for_clat"

* changes:
  make bpf_headers visible to libclat
  make bpf_syscall_wrappers visible to libclat

common/native/bpf_headers/Android.bp

diff --git a/common/native/bpf_headers/Android.bp b/common/native/bpf_headers/Android.bp
index a9f6984..6df5dcb 100644
--- a/common/native/bpf_headers/Android.bp
+++ b/common/native/bpf_headers/Android.bp
@@ -47,6 +47,7 @@
         "//packages/modules/Connectivity/bpf_progs",
         "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/service/native",
+	"//packages/modules/Connectivity/service/native/libs/libclat",
         "//packages/modules/Connectivity/tests/unit/jni",
         "//packages/modules/DnsResolver/tests",
         "//system/bpf/bpfloader",

common/native/bpf_syscall_wrappers/Android.bp

diff --git a/common/native/bpf_syscall_wrappers/Android.bp b/common/native/bpf_syscall_wrappers/Android.bp
index c1bfd80..ad42622 100644
--- a/common/native/bpf_syscall_wrappers/Android.bp
+++ b/common/native/bpf_syscall_wrappers/Android.bp
@@ -40,6 +40,7 @@
         "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/service",
         "//packages/modules/Connectivity/service/native",
+	"//packages/modules/Connectivity/service/native/libs/libclat",
         "//packages/modules/Connectivity/Tethering",
         "//packages/providers/MediaProvider/jni",
         "//system/bpf/libbpf_android",