From 03b717d3f1f4ebb02debd11350e0321ca459d4a2 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Thu, 18 Jul 2024 15:13:50 +0000 Subject: [PATCH] android: Use slices.DeleteFunc for filtering Clean-up two filters in arch.go by using slices.DeleteFunc Bug: 353739440 Test: m blueprint_tests Change-Id: I3738bb7961830e2c287257cceb64194f048514d3 --- android/arch.go | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/android/arch.go b/android/arch.go index 251990b5f..6d896e5fc 100644 --- a/android/arch.go +++ b/android/arch.go @@ -19,6 +19,7 @@ import ( "fmt" "reflect" "runtime" + "slices" "strings" "github.com/google/blueprint" @@ -592,26 +593,16 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) { // Filter NativeBridge targets unless they are explicitly supported. // Skip creating native bridge variants for non-core modules. if os == Android && !(base.IsNativeBridgeSupported() && image == CoreVariation) { - - var targets []Target - for _, t := range osTargets { - if !t.NativeBridge { - targets = append(targets, t) - } - } - - osTargets = targets + osTargets = slices.DeleteFunc(slices.Clone(osTargets), func(t Target) bool { + return bool(t.NativeBridge) + }) } // Filter HostCross targets if disabled. if base.HostSupported() && !base.HostCrossSupported() { - var targets []Target - for _, t := range osTargets { - if !t.HostCross { - targets = append(targets, t) - } - } - osTargets = targets + osTargets = slices.DeleteFunc(slices.Clone(osTargets), func(t Target) bool { + return t.HostCross + }) } // only the primary arch in the ramdisk / vendor_ramdisk / recovery partition