diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-29 17:56:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-29 17:56:21 +0000 |
| commit | 86477cfeb210252e477bcf712d8887c6157a57e8 (patch) | |
| tree | ef1de14ed1fad041b440f2393bd24153c96a7659 /java/platform_bootclasspath.go | |
| parent | e07056af412bda992c312b02522bbd032d78928e (diff) | |
| parent | e3ecce67c14e0edda22938648cb3a797ca2409ef (diff) | |
Merge "Make platform_bootclasspath a singleton module"
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 6bf9ea0b8..d341591d3 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -26,7 +26,7 @@ func init() { } 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 @@ -38,7 +38,7 @@ var ( ) type platformBootclasspathModule struct { - android.ModuleBase + android.SingletonModuleBase ClasspathFragmentBase properties platformBootclasspathProperties @@ -69,7 +69,7 @@ type platformBootclasspathProperties struct { Hidden_api HiddenAPIFlagFileProperties } -func platformBootclasspathFactory() android.Module { +func platformBootclasspathFactory() android.SingletonModule { m := &platformBootclasspathModule{} m.AddProperties(&m.properties) // 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) { b.classpathFragmentBase().generateAndroidBuildActions(ctx) |