diff --git a/apex/apex.go b/apex/apex.go index df29c2750..4fbec6026 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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)) { diff --git a/apex/apex_test.go b/apex/apex_test.go index 0fdad85fc..0420586de 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -2367,11 +2367,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) {