diff options
| author | 2023-09-22 02:06:54 +0000 | |
|---|---|---|
| committer | 2023-09-22 02:06:54 +0000 | |
| commit | 9c5b51e4f62a481d293ff5dea26bfae04620fe65 (patch) | |
| tree | 936222af779cfbf2d11a16cbc95c1c4a912b28ae | |
| parent | 7ba007a3c6337e6311101c35cc82d3df7b4df0cb (diff) | |
| parent | fca0ccc744ca224a4496d1b18379d722c04c9a98 (diff) | |
Merge "Remove unused file path" into main
| -rw-r--r-- | android/allowlists/allowlists.go | 1 | ||||
| -rw-r--r-- | bpf/bpf.go | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 6cc5a633a..5c8e5e31c 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -245,7 +245,6 @@ var ( "frameworks/hardware/interfaces/stats/aidl": Bp2BuildDefaultTrue, "frameworks/libs/modules-utils/build": Bp2BuildDefaultTrueRecursively, "frameworks/libs/modules-utils/java": Bp2BuildDefaultTrue, - "frameworks/libs/net/common/native": Bp2BuildDefaultTrueRecursively, // TODO(b/296014682): Remove this path "frameworks/native": Bp2BuildDefaultTrue, "frameworks/native/libs/adbd_auth": Bp2BuildDefaultTrueRecursively, "frameworks/native/libs/arect": Bp2BuildDefaultTrueRecursively, diff --git a/bpf/bpf.go b/bpf/bpf.go index 38777ff65..ba825cf28 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -153,8 +153,6 @@ func (bpf *bpf) GenerateAndroidBuildActions(ctx android.ModuleContext) { // The architecture doesn't matter here, but asm/types.h is included by linux/types.h. "-isystem bionic/libc/kernel/uapi/asm-arm64", "-isystem bionic/libc/kernel/android/uapi", - // TODO(b/296014682): Remove after the bpf_headers is moved to Connectivity - "-I frameworks/libs/net/common/native/bpf_headers/include/bpf", "-I packages/modules/Connectivity/staticlibs/native/bpf_headers/include/bpf", // TODO(b/149785767): only give access to specific file with AID_* constants "-I system/core/libcutils/include", |