From fca0ccc744ca224a4496d1b18379d722c04c9a98 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Thu, 21 Sep 2023 17:01:21 +0900 Subject: [PATCH] Remove unused file path frameworks/libs/net was moved to the packages/modules/Connectivity Bug: 296014682 Test: TH Change-Id: I1c17eb0cb4a2d6d2526b26fd800f206e93d4e009 --- android/allowlists/allowlists.go | 1 - bpf/bpf.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 483cc8437..8dbb64137 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -241,7 +241,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 d135d5f56..ee2a5b6bf 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",