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

Update variable name in error messages. am: e5b2b49a73

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

Change-Id: Icb57f58d9efdf8793162254eefe8e3150d6d9cf5
This commit is contained in:
Ulya Trafimovich
2021-10-04 16:18:58 +00:00
committed by Automerger Merge Worker
parent 349f4963df e5b2b49a73
commit ef92591c59
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"),
).
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",

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.
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