d5cf92e298
Previously, modules customized behavior around the handling of sourceOrOutputDependencyTag by comparing them to android.SourceDepTag and retrieving the module using something like this: ctx.GetDirectDepWithTag(m, android.SourceDepTag) The problem with that is it does not allow an output tag to be specified and does not handle fully qualified names properly. This adds the following: * IsSourceDepTag and IsSourceDepTagWithOutputTag to check whether a blueprint.DependencyTag is a sourceOrOutputDependencyTag. The latter also checks that it has the correct output tag. * GetModuleFromPathDep(ctx, moduleName, outputTag) as a replacement for ctx.GetDirectDepWithTag(m, android.SourceDepTag). Replaces usages of: * t == SourceDepTag with IsSourceDepTagWithOutputTag(t, "") * ctx.GetDirectDepWithTag(m, android.SourceDepTag) with GetModuleFromPathDep(ctx, m, "") It also deprecates the following: * android.SourcDepTag - as a follow up change needs to modify the sourceOrOutputDependencyTag will make this useless. * ExpandSources, ExpandsSources - copies existing deprecated messages from the implementation to the interface so that they can be seen by users of that interface. Bug: 193228441 Test: m nothing Change-Id: I8c397232b8d7dc1f9702c04ad45ea7819d4631ae
175 lines
3.4 KiB
Go
175 lines
3.4 KiB
Go
// Copyright 2019 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package android
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
type pathDepsMutatorTestModule struct {
|
|
ModuleBase
|
|
props struct {
|
|
Foo string `android:"path"`
|
|
Bar []string `android:"path,arch_variant"`
|
|
Baz *string `android:"path"`
|
|
Qux string
|
|
V *struct {
|
|
W string `android:"path"`
|
|
}
|
|
}
|
|
|
|
// A second property struct with a duplicate property name
|
|
props2 struct {
|
|
Foo string `android:"path"`
|
|
}
|
|
|
|
// nested slices of struct
|
|
props3 struct {
|
|
X []struct {
|
|
Y []struct {
|
|
Z []string `android:"path"`
|
|
}
|
|
}
|
|
}
|
|
|
|
sourceDeps []string
|
|
}
|
|
|
|
func pathDepsMutatorTestModuleFactory() Module {
|
|
module := &pathDepsMutatorTestModule{}
|
|
module.AddProperties(&module.props, &module.props2, &module.props3)
|
|
InitAndroidArchModule(module, DeviceSupported, MultilibBoth)
|
|
return module
|
|
}
|
|
|
|
func (p *pathDepsMutatorTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
|
ctx.VisitDirectDeps(func(dep Module) {
|
|
if _, ok := ctx.OtherModuleDependencyTag(dep).(sourceOrOutputDependencyTag); ok {
|
|
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
|
|
m := SrcIsModule(p.props.Foo)
|
|
if GetModuleFromPathDep(ctx, m, "") == nil {
|
|
ctx.ModuleErrorf("GetDirectDepWithTag failed")
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPathDepsMutator(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
bp string
|
|
deps []string
|
|
}{
|
|
{
|
|
name: "all",
|
|
bp: `
|
|
test {
|
|
name: "foo",
|
|
foo: ":a",
|
|
bar: [":b"],
|
|
baz: ":c{.bar}",
|
|
qux: ":d",
|
|
x: [
|
|
{
|
|
y: [
|
|
{
|
|
z: [":x", ":y"],
|
|
},
|
|
{
|
|
z: [":z"],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
v: {
|
|
w: ":w",
|
|
},
|
|
}`,
|
|
deps: []string{"a", "b", "c", "w", "x", "y", "z"},
|
|
},
|
|
{
|
|
name: "arch variant",
|
|
bp: `
|
|
test {
|
|
name: "foo",
|
|
arch: {
|
|
arm64: {
|
|
bar: [":a"],
|
|
},
|
|
arm: {
|
|
bar: [":b"],
|
|
},
|
|
},
|
|
bar: [":c"],
|
|
}`,
|
|
deps: []string{"c", "a"},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
bp := test.bp + `
|
|
filegroup {
|
|
name: "a",
|
|
}
|
|
|
|
filegroup {
|
|
name: "b",
|
|
}
|
|
|
|
filegroup {
|
|
name: "c",
|
|
}
|
|
|
|
filegroup {
|
|
name: "d",
|
|
}
|
|
|
|
filegroup {
|
|
name: "w",
|
|
}
|
|
|
|
filegroup {
|
|
name: "x",
|
|
}
|
|
|
|
filegroup {
|
|
name: "y",
|
|
}
|
|
|
|
filegroup {
|
|
name: "z",
|
|
}
|
|
`
|
|
|
|
result := GroupFixturePreparers(
|
|
PrepareForTestWithArchMutator,
|
|
PrepareForTestWithFilegroup,
|
|
FixtureRegisterWithContext(func(ctx RegistrationContext) {
|
|
ctx.RegisterModuleType("test", pathDepsMutatorTestModuleFactory)
|
|
}),
|
|
FixtureWithRootAndroidBp(bp),
|
|
).RunTest(t)
|
|
|
|
m := result.Module("foo", "android_arm64_armv8-a").(*pathDepsMutatorTestModule)
|
|
|
|
AssertDeepEquals(t, "deps", test.deps, m.sourceDeps)
|
|
})
|
|
}
|
|
}
|