tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update apex dependency even for test and non-installable APEXes

Browse source 
The apex dependency map wasn't updated for test or non-installable
APEXes to work around the problem that a module being in such APEX
prevented the module from being installed in the system partition.

Since that problem is not happening any more, removing the unnecessary
work-around.

Bug: 123892969
Test: m
Change-Id: I43e07a9611a3e08ff39b9a64454b1c67949d35bc
This commit is contained in:
Jiyong Park 2020-02-12 07:45:16 +09:00
parent 2d743b54c7
commit ab872e0295
2 changed files with 1 additions and 11 deletions
Show stats 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) depName := mctx.OtherModuleName(child)
// If the parent is apexBundle, this child is directly depended. // If the parent is apexBundle, this child is directly depended.
_, directDep := parent.(*apexBundle) _, directDep := parent.(*apexBundle)
if a.installable() && !a.testApex { android.UpdateApexDependency(apexBundleName, depName, directDep)
// 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)
}
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() && if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
(directDep || am.DepIsInSameApex(mctx, child)) { (directDep || am.DepIsInSameApex(mctx, child)) {

5
apex/apex_test.go
View file

@ -2361,11 +2361,6 @@ func TestTestApex(t *testing.T) {
// Ensure that the platform variant ends with _shared // Ensure that the platform variant ends with _shared
ensureListContains(t, ctx.ModuleVariantsForTests("mylib_common_test"), "android_arm64_armv8-a_shared") ensureListContains(t, ctx.ModuleVariantsForTests("mylib_common_test"), "android_arm64_armv8-a_shared")
if android.InAnyApex("mylib_common_test") {
t.Log("Found mylib_common_test in some apex!")
t.Fail()
}
} }
func TestApexWithTarget(t *testing.T) { func TestApexWithTarget(t *testing.T) {