Remove the arch-based filtering hack in packaging.go
aosp/1501613 has landed. The filtering hack is no longer needed. Also, fixed a bug that the dependency to the dynamic linker is not treated as install dep. Bug: N/A Test: `m hosttar` and compare the built cvd-host_package.tar.gz with and without this change. There is no removed file. Change-Id: I19ef64e10d34bc8be2592c5258505cd632c91af9
This commit is contained in:
@@ -29,6 +29,12 @@ type componentTestModule struct {
|
||||
}
|
||||
}
|
||||
|
||||
// dep tag used in this test. All dependencies are considered as installable.
|
||||
type installDepTag struct {
|
||||
blueprint.BaseDependencyTag
|
||||
InstallAlwaysNeededDependencyTag
|
||||
}
|
||||
|
||||
func componentTestModuleFactory() Module {
|
||||
m := &componentTestModule{}
|
||||
m.AddProperties(&m.props)
|
||||
@@ -37,7 +43,7 @@ func componentTestModuleFactory() Module {
|
||||
}
|
||||
|
||||
func (m *componentTestModule) DepsMutator(ctx BottomUpMutatorContext) {
|
||||
ctx.AddDependency(ctx.Module(), nil, m.props.Deps...)
|
||||
ctx.AddDependency(ctx.Module(), installDepTag{}, m.props.Deps...)
|
||||
}
|
||||
|
||||
func (m *componentTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
||||
@@ -63,7 +69,7 @@ func packageTestModuleFactory() Module {
|
||||
}
|
||||
|
||||
func (m *packageTestModule) DepsMutator(ctx BottomUpMutatorContext) {
|
||||
m.AddDeps(ctx, struct{ blueprint.BaseDependencyTag }{})
|
||||
m.AddDeps(ctx, installDepTag{})
|
||||
}
|
||||
|
||||
func (m *packageTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
||||
|
Reference in New Issue
Block a user