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

Merge "Make sure that classpath fragment contents appear in make vars." am: 28e5eda261

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

Change-Id: I216856a16603567c623114d3b5b42506e9dc89b2
This commit is contained in:
satayev
2021-08-24 13:40:05 +00:00
committed by Automerger Merge Worker
parent 383f7cb2b1 28e5eda261
commit dbd6abe28d
6 changed files with 209 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/systemserver_classpath_fragment.go
View File

@@ -107,7 +107,16 @@ func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext)
global := dexpreopt.GetGlobalConfig(ctx)
possibleUpdatableModules := gatherPossibleApexModuleNamesAndStems(ctx, s.properties.Contents, systemServerClasspathFragmentContentDepTag)
return global.ApexSystemServerJars.Filter(possibleUpdatableModules)
jars, unknown := global.ApexSystemServerJars.Filter(possibleUpdatableModules)
// TODO(satayev): remove geotz ssc_fragment, since geotz is not part of SSCP anymore.
_, unknown = android.RemoveFromList("geotz", unknown)
// For non test apexes, make sure that all contents are actually declared in make.
if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 {
ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS", unknown)
}
return jars
}
type systemServerClasspathFragmentContentDependencyTag struct {