From 1e7e0432fa917be93d02679848ee9c3e93720fd6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 2 Feb 2024 10:59:50 -0800
Subject: [PATCH] Follow signature update to ExtendMatchingProperties

The order function passed to ExtendMatchingProperites no longer takes
a property, dstValue or srcValue parameter.

Test: builds
Change-Id: I19fc554f705fbf42100f0a38df87e2d1fb2454ec
---
 android/arch.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/arch.go b/android/arch.go
index b09a3022f..4fe434502 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -1060,9 +1060,7 @@ func mergePropertyStruct(ctx ArchVariantContext, dst interface{}, srcValue refle
 	// order checks the `android:"variant_prepend"` tag to handle properties where the
 	// arch-specific value needs to come before the generic value, for example for lists of
 	// include directories.
-	order := func(property string,
-		dstField, srcField reflect.StructField,
-		dstValue, srcValue interface{}) (proptools.Order, error) {
+	order := func(dstField, srcField reflect.StructField) (proptools.Order, error) {
 		if proptools.HasTag(dstField, "android", "variant_prepend") {
 			return proptools.Prepend, nil
 		} else {