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:
@@ -144,15 +144,9 @@ func (p *PackagingBase) AddDeps(ctx BottomUpMutatorContext, depTag blueprint.Dep
|
||||
|
||||
// See PackageModule.CopyDepsToZip
|
||||
func (p *PackagingBase) CopyDepsToZip(ctx ModuleContext, zipOut OutputPath) (entries []string) {
|
||||
var supportedArches []string
|
||||
for _, t := range p.getSupportedTargets(ctx) {
|
||||
supportedArches = append(supportedArches, t.Arch.ArchType.String())
|
||||
}
|
||||
m := make(map[string]PackagingSpec)
|
||||
ctx.WalkDeps(func(child Module, parent Module) bool {
|
||||
// Don't track modules with unsupported arch
|
||||
// TODO(jiyong): remove this when aosp/1501613 lands.
|
||||
if !InList(child.Target().Arch.ArchType.String(), supportedArches) {
|
||||
if !IsInstallDepNeeded(ctx.OtherModuleDependencyTag(child)) {
|
||||
return false
|
||||
}
|
||||
for _, ps := range child.PackagingSpecs() {
|
||||
|
Reference in New Issue
Block a user