From 5bddbcfeb2ecf83c5b4f8935e84b50f78368ce68 Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Sat, 20 Nov 2021 21:52:51 +0800 Subject: [PATCH] [NETD-BPF#7] Update dependency for moving bpf_shared.h To mainline BPF code in Netd, the bpf_shared.h is from Netd to mainline module. This commit is currently required because a user of bpf_shared.h locates in platform. Once the caller is also moved to mainline, the dependency can be removed. Bug: 202086915 Test: see below Apex-Size-Increase: 0. Adding a header file in cc_library_headers does not increase apex size. ($du -b out/.../com.google.android.tethering before and after patch are the same.) Previous-Platform-Support: Yes Ignore-AOSP-First: merge conflict resolutions Test-Info: 1. m; flash; boot 2. cd system/netd && atest 3. cd packages/modules/Connectivity && atest 4. atest FrameworksNetTests Merged-In: If4998deb102ee4a5a842b4afa53dccc7b428611d Change-Id: If4998deb102ee4a5a842b4afa53dccc7b428611d --- build/allowed_deps.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index e4d6d9d..0f86fdc 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -177,6 +177,7 @@ bionic_libc_platform_headers(minSdkVersion:29) boringssl_self_test(minSdkVersion:29) bouncycastle(minSdkVersion:31) bouncycastle-unbundled(minSdkVersion:30) +bpf_connectivity_headers(minSdkVersion:30) bpf_syscall_wrappers(minSdkVersion:30) brotli-java(minSdkVersion:current) captiveportal-lib(minSdkVersion:29) @@ -345,6 +346,7 @@ libcodec2_soft_vp8enc(minSdkVersion:29) libcodec2_soft_vp9dec(minSdkVersion:29) libcodec2_soft_vp9enc(minSdkVersion:29) libcodec2_vndk(minSdkVersion:29) +libcom_android_networkstack_tethering_util_jni(minSdkVersion:30) libcompiler_builtins.rust_sysroot(minSdkVersion:(no version)) libcore.rust_sysroot(minSdkVersion:(no version)) libcrypto(minSdkVersion:29)