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

Merge "Populate individual systemserverclasspath_fragments' proto configs."

Browse Source
This commit is contained in:
satayev
2021-05-25 11:38:40 +00:00
committed by Gerrit Code Review
parent 962a8f0253 703c67a0a9
commit 8a7bbb5b79
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 { func (p *platformSystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {
global := dexpreopt.GetGlobalConfig(ctx) global := dexpreopt.GetGlobalConfig(ctx)
return global.SystemServerJars
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
} }
type SystemServerClasspathModule struct { type SystemServerClasspathModule struct {
@@ -101,8 +95,12 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo
} }
func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList { func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList {
// TODO(satayev): populate with actual content global := dexpreopt.GetGlobalConfig(ctx)
return android.EmptyConfiguredJarList()
// 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 { type systemServerClasspathFragmentContentDependencyTag struct {