From e5b2b49a732cfe35653b8b24b3ca442e2d1ec634 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Mon, 4 Oct 2021 15:42:53 +0100 Subject: [PATCH] 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 --- apex/systemserver_classpath_fragment_test.go | 2 +- java/systemserver_classpath_fragment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/systemserver_classpath_fragment_test.go b/apex/systemserver_classpath_fragment_test.go index dc682faa4..412fa0e37 100644 --- a/apex/systemserver_classpath_fragment_test.go +++ b/apex/systemserver_classpath_fragment_test.go @@ -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", diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index 1b4fda821..f209f4a68 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -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