StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the arch-based filtering hack in packaging.go"

Browse Source
This commit is contained in:
Jiyong Park
2020-12-02 01:24:17 +00:00
committed by Gerrit Code Review
parent e76ec1cbeb d630bdd4dd
commit f10995b7b6
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/packaging.go
View File

@@ -153,15 +153,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() {