StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow signature update to ExtendMatchingProperties

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

Test: builds
Change-Id: I19fc554f705fbf42100f0a38df87e2d1fb2454ec
This commit is contained in:
Colin Cross
2024-02-02 10:59:50 -08:00
parent 984223fd04
commit 1e7e0432fa
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/arch.go
View File

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