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

Commit e5b2b49a authored Oct 04, 2021 by Ulya Trafimovich

Update variable name in error messages.

Variable PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS was renamed to
PRODUCT_APEX_SYSTEM_SERVER_JARS in https://r.android.com/1779472.

Bug: 191127295
Test: m nothing
Change-Id: I0c8ae839cab443c824760b40d30b4374982010f9

parent 9c03ef77

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