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

Merge "Make platform_bootclasspath a singleton module" am: 86477cfeb2

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

Change-Id: I5fe5f37dfc470674f7a7fe7907584ccaf0ea1d7a
This commit is contained in:
Paul Duffin
2021-04-29 18:11:24 +00:00
committed by Automerger Merge Worker
parent ce7b244e33 86477cfeb2
commit 4b00abc5f7
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/platform_bootclasspath.go
View File

@@ -26,7 +26,7 @@ func init() {
} }
func registerPlatformBootclasspathBuildComponents(ctx android.RegistrationContext) { func registerPlatformBootclasspathBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("platform_bootclasspath", platformBootclasspathFactory) ctx.RegisterSingletonModuleType("platform_bootclasspath", platformBootclasspathFactory)
} }
// The tags used for the dependencies between the platform bootclasspath and any configured boot // The tags used for the dependencies between the platform bootclasspath and any configured boot
@@ -38,7 +38,7 @@ var (
) )
type platformBootclasspathModule struct { type platformBootclasspathModule struct {
android.ModuleBase android.SingletonModuleBase
ClasspathFragmentBase ClasspathFragmentBase
properties platformBootclasspathProperties properties platformBootclasspathProperties
@@ -69,7 +69,7 @@ type platformBootclasspathProperties struct {
Hidden_api HiddenAPIFlagFileProperties Hidden_api HiddenAPIFlagFileProperties
} }
func platformBootclasspathFactory() android.Module { func platformBootclasspathFactory() android.SingletonModule {
m := &platformBootclasspathModule{} m := &platformBootclasspathModule{}
m.AddProperties(&m.properties) m.AddProperties(&m.properties)
// TODO(satayev): split systemserver and apex jars into separate configs. // TODO(satayev): split systemserver and apex jars into separate configs.
@@ -154,6 +154,18 @@ func addDependenciesOntoBootImageModules(ctx android.BottomUpMutatorContext, mod
} }
} }
// GenerateSingletonBuildActions does nothing and must never do anything.
//
// This module only implements android.SingletonModule so that it can implement
// android.SingletonMakeVarsProvider.
func (b *platformBootclasspathModule) GenerateSingletonBuildActions(android.SingletonContext) {
// Keep empty
}
func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) {
// Placeholder for now.
}
func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
b.classpathFragmentBase().generateAndroidBuildActions(ctx) b.classpathFragmentBase().generateAndroidBuildActions(ctx)