Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e7e0432 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 984223fd

android/arch.go

+1 −3
Original line number Diff line number Diff line
@@ -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 {