commit 67a69e73966e728a675fb1990e4090cee68edf0b
author Wayne Ma <waynema@google.com> Wed Jan 12 11:44:27 2022 +0800
committer Wayne Ma <waynema@google.com> Fri Jan 14 12:24:13 2022 +0800
tree 838664c8a3c82dc352de5ee8343d00879c4a0da1
parent dcf33325cf021eb7742f0b64c08c66c9e20f665c

[NETD-TC#12] Fix dependency on libtraffic_controller

1. Add visibility for libtraffic_control
2. Add com.android.tethering into apex_available statement

Bug: 202086915
Test: m; flash; boot
Change-Id: I817e22c24dd205f09ef62a2a7ff85b2a970f6d3a

staticlibs/native/bpf_headers/Android.bp

diff --git a/staticlibs/native/bpf_headers/Android.bp b/staticlibs/native/bpf_headers/Android.bp
index 06ba1b0..8426dce 100644
--- a/staticlibs/native/bpf_headers/Android.bp
+++ b/staticlibs/native/bpf_headers/Android.bp
@@ -45,6 +45,7 @@
         "//frameworks/native/services/gpuservice/tracing",
         "//packages/modules/Connectivity/bpf_progs",
         "//packages/modules/Connectivity/netd",
+        "//packages/modules/Connectivity/service/native",
         "//packages/modules/Connectivity/tests/unit/jni",
         "//packages/modules/DnsResolver/tests",
         "//system/bpf/bpfloader",

staticlibs/native/bpf_syscall_wrappers/Android.bp

diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp
index 1a1b53c..6d61256 100644
--- a/staticlibs/native/bpf_syscall_wrappers/Android.bp
+++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp
@@ -38,6 +38,7 @@
         "//frameworks/libs/net/common/native/bpfmapjni",
         "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/service",
+        "//packages/modules/Connectivity/service/native",
         "//packages/modules/Connectivity/Tethering",
         "//packages/providers/MediaProvider/jni",
         "//system/bpf/libbpf_android",

staticlibs/netd/Android.bp

diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp
index c3f9374..a615ec1 100644
--- a/staticlibs/netd/Android.bp
+++ b/staticlibs/netd/Android.bp
@@ -48,6 +48,7 @@
     ],
     apex_available: [
         "com.android.resolv",
+        "com.android.tethering",
     ],
     min_sdk_version: "29",
 }
@@ -97,6 +98,7 @@
         ndk: {
             apex_available: [
                 "//apex_available:platform",
+                "com.android.tethering",
             ],
             // This is necessary for the DnsResovler tests to run in Android Q.
             // Soong would recognize this value and produce the Q compatible aidl library.