Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab872e02 authored Feb 12, 2020 by Jiyong Park

Update apex dependency even for test and non-installable APEXes

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

parent 2d743b54

apex/apex.go

+1 −6

Original line number	Diff line number	Diff line
		@@ -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)
		}

		if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
		(directDep \|\| am.DepIsInSameApex(mctx, child)) {

apex/apex_test.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -2361,11 +2361,6 @@ func TestTestApex(t *testing.T) {

		// Ensure that the platform variant ends with _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) {