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

Commit 7bd9444b authored by Jiyong Park's avatar Jiyong Park
Browse files

Apex_available check failure reveals dependency 

When the check for apex_available has failed, the build system now shows
the module that brought the unavailable module into the APEX.

Bug: 151051671
Test: m
Change-Id: Id1a3fda67fe56fdc2dc90ec800d10689415de4d6
parent bc4df100

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -1982,7 +1982,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { 
		if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) {

			return

		}

		ctx.ModuleErrorf("requires %q that is not available for the APEX.", to.Name())

		ctx.ModuleErrorf("%q requires %q that is not available for the APEX.", from.Name(), to.Name())

	})

}

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -3011,7 +3011,7 @@ func TestApexWithTestHelperApp(t *testing.T) { 


func TestApexPropertiesShouldBeDefaultable(t *testing.T) {

	// libfoo's apex_available comes from cc_defaults

	testApexError(t, `"myapex" .*: requires "libfoo" that is not available for the APEX`, `

	testApexError(t, `"myapex" .*: "myapex" requires "libfoo" that is not available for the APEX`, `

	apex {

		name: "myapex",

		key: "myapex.key",