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

Commit 79d4a86c authored by Ulya Trafimovich's avatar Ulya Trafimovich Committed by Automerger Merge Worker
Browse files

Update variable name in error messages. am: e5b2b49a am: ef92591c am: 1fae1299 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844308

Change-Id: Iaaf1e337bdc42efc893ac48dcbfb7dfc158ee88b
parents 997c0e98 1fae1299

apex/systemserver_classpath_fragment_test.go

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ func TestSystemServerClasspathFragmentWithContentNotInMake(t *testing.T) { 
		dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"),

	).

		ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(

			`in contents must also be declared in PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS`)).

			`in contents must also be declared in PRODUCT_APEX_SYSTEM_SERVER_JARS`)).

		RunTestWithBp(t, `

			apex {

				name: "myapex",

java/systemserver_classpath_fragment.go

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext) 


	// For non test apexes, make sure that all contents are actually declared in make.

	if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 && !android.IsModuleInVersionedSdk(ctx.Module()) {

		ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS", unknown)

		ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_SYSTEM_SERVER_JARS", unknown)

	}



	return jars