From b17d60144a61eecd9f5667626fba0e9550045dec Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Mon, 11 Dec 2023 14:58:03 +0900 Subject: [PATCH] Remove TrunkStable.bp Aconfig Flag for android network is defined in the platform and TrunkStable.bp is not used. Test: TH Bug: 315302281 Change-Id: I46d988f25a366e51da52af01ad34e2ce1511c942 --- common/Android.bp | 6 ------ common/TrunkStable.bp | 16 ---------------- 2 files changed, 22 deletions(-) delete mode 100644 common/TrunkStable.bp diff --git a/common/Android.bp b/common/Android.bp index 1d73a46af5..f2f3929e11 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -19,12 +19,6 @@ package { default_applicable_licenses: ["Android-Apache-2.0"], } -build = ["TrunkStable.bp"] - -// This is a placeholder comment to avoid merge conflicts -// as the above target may not exist -// depending on the branch - // The library requires the final artifact to contain net-utils-device-common-struct. java_library { name: "connectivity-net-module-utils-bpf", diff --git a/common/TrunkStable.bp b/common/TrunkStable.bp deleted file mode 100644 index 59874c216d..0000000000 --- a/common/TrunkStable.bp +++ /dev/null @@ -1,16 +0,0 @@ -// -// Copyright (C) 2023 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -