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

Merge "Populate individual systemserverclasspath_fragments' proto configs." am: 8a7bbb5b79

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

Change-Id: I01a55dbf58869d4b85a7e6085c0a885a323a905e
This commit is contained in:
satayev
2021-05-25 12:58:12 +00:00
committed by Automerger Merge Worker
parent 94e25a1664 8a7bbb5b79
commit 9a1a908ae5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/systemserver_classpath_fragment.go
View File

@@ -53,13 +53,7 @@ func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx an
func (p *platformSystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {
global := dexpreopt.GetGlobalConfig(ctx)
jars := global.SystemServerJars
// TODO(satayev): split apex jars into separate configs.
for i := 0; i < global.UpdatableSystemServerJars.Len(); i++ {
jars = jars.Append(global.UpdatableSystemServerJars.Apex(i), global.UpdatableSystemServerJars.Jar(i))
}
return jars
return global.SystemServerJars
}
type SystemServerClasspathModule struct {
@@ -101,8 +95,12 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo
}
func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {
// TODO(satayev): populate with actual content
return android.EmptyConfiguredJarList()
global := dexpreopt.GetGlobalConfig(ctx)
// Only create configs for updatable boot jars. Non-updatable system server jars must be part of the
// platform_systemserverclasspath's classpath proto config to guarantee that they come before any
// updatable jars at runtime.
return global.UpdatableSystemServerJars.Filter(s.properties.Contents)
}
type systemServerClasspathFragmentContentDependencyTag struct {