diff options
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 155afc6c2..130f625e9 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -51,16 +51,16 @@ type platformBootclasspathModule struct { properties platformBootclasspathProperties // The apex:module pairs obtained from the configured modules. - configuredModules []android.Module + configuredModules []android.ModuleProxy // The apex:module pairs obtained from the fragments. - fragments []android.Module + fragments []android.ModuleProxy // The map of apex to the fragments they contain. - apexNameToFragment map[string]android.Module + apexNameToFragment map[string]android.ModuleProxy // The map of library modules in the bootclasspath to the fragments that contain them. - libraryToApex map[android.Module]string + libraryToApex map[android.ModuleProxy]string // Path to the monolithic hiddenapi-flags.csv file. hiddenAPIFlagsCSV android.OutputPath @@ -181,8 +181,8 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo // Do not add implLibModule to allModules as the impl lib is only used to collect the // transitive source files - var implLibModule []android.Module - ctx.VisitDirectDepsWithTag(platformBootclasspathImplLibDepTag, func(m android.Module) { + var implLibModule []android.ModuleProxy + ctx.VisitDirectDepsProxyWithTag(platformBootclasspathImplLibDepTag, func(m android.ModuleProxy) { implLibModule = append(implLibModule, m) }) @@ -251,7 +251,7 @@ func (b *platformBootclasspathModule) platformJars(ctx android.PathContext) andr // checkPlatformModules ensures that the non-updatable modules supplied are not part of an // apex module. -func (b *platformBootclasspathModule) checkPlatformModules(ctx android.ModuleContext, modules []android.Module) { +func (b *platformBootclasspathModule) checkPlatformModules(ctx android.ModuleContext, modules []android.ModuleProxy) { // TODO(satayev): change this check to only allow core-icu4j, all apex jars should not be here. for _, m := range modules { apexInfo, _ := android.OtherModuleProvider(ctx, m, android.ApexInfoProvider) @@ -266,7 +266,7 @@ func (b *platformBootclasspathModule) checkPlatformModules(ctx android.ModuleCon } // checkApexModules ensures that the apex modules supplied are not from the platform. -func (b *platformBootclasspathModule) checkApexModules(ctx android.ModuleContext, modules []android.Module) { +func (b *platformBootclasspathModule) checkApexModules(ctx android.ModuleContext, modules []android.ModuleProxy) { for _, m := range modules { apexInfo, _ := android.OtherModuleProvider(ctx, m, android.ApexInfoProvider) fromUpdatableApex := apexInfo.Updatable @@ -298,8 +298,10 @@ func (b *platformBootclasspathModule) checkApexModules(ctx android.ModuleContext } // generateHiddenAPIBuildActions generates all the hidden API related build rules. -func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.Module, - fragments []android.Module, libraryToApex map[android.Module]string, apexNameToFragment map[string]android.Module) bootDexJarByModule { +func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.ModuleProxy, + fragments []android.ModuleProxy, libraryToApex map[android.ModuleProxy]string, + apexNameToFragment map[string]android.ModuleProxy) bootDexJarByModule { + createEmptyHiddenApiFiles := func() { paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV} for _, path := range paths { |