StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update variable name in error messages.

Browse Source 
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
This commit is contained in:
Ulya Trafimovich
2021-10-04 15:42:53 +01:00
parent 9c03ef7790
commit e5b2b49a73
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/systemserver_classpath_fragment_test.go
View File

@@ -138,7 +138,7 @@ func TestSystemServerClasspathFragmentWithContentNotInMake(t *testing.T) {
dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"), dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"),
). ).
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern( 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, ` RunTestWithBp(t, `
apex { apex {
name: "myapex", name: "myapex",

2
java/systemserver_classpath_fragment.go
View File

@@ -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. // 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()) { 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 return jars