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

Commit 06b362fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Apex_available check failure reveals dependency"

parents 714538fb 65cc4f77

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,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
@@ -3345,7 +3345,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",