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

Merge "Update apex dependency even for test and non-installable APEXes"

Browse Source
This commit is contained in:
Treehugger Robot
2020-02-12 07:45:47 +00:00
committed by Gerrit Code Review
parent 6655756230 ab872e0295
commit 4e29184a4e
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/apex.go
View File

@@ -1042,12 +1042,7 @@ func apexDepsMutator(mctx android.BottomUpMutatorContext) {
depName := mctx.OtherModuleName(child)
// If the parent is apexBundle, this child is directly depended.
_, directDep := parent.(*apexBundle)
if a.installable() && !a.testApex {
// TODO(b/123892969): Workaround for not having any way to annotate test-apexs
// non-installable apex's cannot be installed and so should not prevent libraries from being
// installed to the system.
android.UpdateApexDependency(apexBundleName, depName, directDep)
}
android.UpdateApexDependency(apexBundleName, depName, directDep)
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
(directDep || am.DepIsInSameApex(mctx, child)) {