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

Commit 527f3e55 authored by Colin Cross's avatar Colin Cross
Browse files

Dedup path properties across property structs 

Listing a property in multiple property structs would cause it to
add multiple dependencies with the same dependency tag, which would
trip the panic in getDirectDepInternal when calling
PathForModuleSrc.  Dedup the properties with the android:"path"
struct tag across all property structs.

Test: path_properties_test.go
Change-Id: Ib6c0e7789443d340ee7551721df0135c5ee64c0f
parent ae113186

android/path_properties.go

+8 −7
Original line number Diff line number Diff line
@@ -35,8 +35,11 @@ func pathDepsMutator(ctx BottomUpMutatorContext) { 


	props := m.base().generalProperties



	var pathProperties []string

	for _, ps := range props {

		pathProperties := pathPropertiesForPropertyStruct(ctx, ps)

		pathProperties = append(pathProperties, pathPropertiesForPropertyStruct(ctx, ps)...)

	}



	pathProperties = FirstUniqueStrings(pathProperties)



	for _, s := range pathProperties {
@@ -44,8 +47,6 @@ func pathDepsMutator(ctx BottomUpMutatorContext) { 
			ctx.AddDependency(ctx.Module(), sourceOrOutputDepTag(t), m)

		}

	}



	}

}



// pathPropertiesForPropertyStruct uses the indexes of properties that are tagged with android:"path" to extract

android/path_properties_test.go

+13 −1
Original line number Diff line number Diff line
@@ -28,12 +28,17 @@ type pathDepsMutatorTestModule struct { 
		Qux string

	}



	// A second property struct with a duplicate property name

	props2 struct {

		Foo string `android:"path"`

	}



	sourceDeps []string

}



func pathDepsMutatorTestModuleFactory() Module {

	module := &pathDepsMutatorTestModule{}

	module.AddProperties(&module.props)

	module.AddProperties(&module.props, &module.props2)

	InitAndroidArchModule(module, DeviceSupported, MultilibBoth)

	return module

}
@@ -44,6 +49,13 @@ func (p *pathDepsMutatorTestModule) GenerateAndroidBuildActions(ctx ModuleContex 
			p.sourceDeps = append(p.sourceDeps, ctx.OtherModuleName(dep))

		}

	})



	if p.props.Foo != "" {

		// Make sure there is only one dependency on a module listed in a property present in multiple property structs

		if ctx.GetDirectDepWithTag(SrcIsModule(p.props.Foo), sourceOrOutputDepTag("")) == nil {

			ctx.ModuleErrorf("GetDirectDepWithTag failed")

		}

	}

}



func TestPathDepsMutator(t *testing.T) {