diff options
| author | Haamed Gheibi <haamed@google.com> | 2021-07-12 20:47:16 +0000 |
|---|---|---|
| committer | Haamed Gheibi <haamed@google.com> | 2021-07-12 20:47:16 +0000 |
| commit | d4fd974eb42fa9bc991011d544a48157aa8e95a7 (patch) | |
| tree | 50a8f5955925465dbbf85d20ac51ff553b16557d /java/platform_bootclasspath.go | |
| parent | ef25c8777180f88650dad8bd2499e8c8c9d174b7 (diff) | |
| parent | 74d33e1a724ff26b5e9175fed9664b5387c7744f (diff) | |
Merge SP1A.210709.002
Change-Id: I875d10af6b1546ee1b90ad5880874f8ef01f7ed3
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 7b651baff..10739b015 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -119,8 +119,8 @@ func (b *platformBootclasspathModule) hiddenAPIDepsMutator(ctx android.BottomUpM } // Add dependencies onto the stub lib modules. - sdkKindToStubLibModules := hiddenAPIComputeMonolithicStubLibModules(ctx.Config()) - hiddenAPIAddStubLibDependencies(ctx, sdkKindToStubLibModules) + apiLevelToStubLibModules := hiddenAPIComputeMonolithicStubLibModules(ctx.Config()) + hiddenAPIAddStubLibDependencies(ctx, apiLevelToStubLibModules) } func (b *platformBootclasspathModule) BootclasspathDepsMutator(ctx android.BottomUpMutatorContext) { @@ -287,7 +287,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. // the fragments will have already provided the flags that are needed. classesJars := monolithicInfo.ClassesJars - // Create the input to pass to ruleToGenerateHiddenAPIStubFlagsFile + // Create the input to pass to buildRuleToGenerateHiddenAPIStubFlagsFile input := newHiddenAPIFlagInput() // Gather stub library information from the dependencies on modules provided by @@ -299,8 +299,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. // Generate the monolithic stub-flags.csv file. stubFlags := hiddenAPISingletonPaths(ctx).stubFlags - rule := ruleToGenerateHiddenAPIStubFlagsFile(ctx, stubFlags, bootDexJarByModule.bootDexJars(), input) - rule.Build("platform-bootclasspath-monolithic-hiddenapi-stub-flags", "monolithic hidden API stub flags") + buildRuleToGenerateHiddenAPIStubFlagsFile(ctx, "platform-bootclasspath-monolithic-hiddenapi-stub-flags", "monolithic hidden API stub flags", stubFlags, bootDexJarByModule.bootDexJars(), input, monolithicInfo.StubFlagsPaths) // Generate the annotation-flags.csv file from all the module annotations. annotationFlags := android.PathForModuleOut(ctx, "hiddenapi-monolithic", "annotation-flags-from-classes.csv") @@ -422,7 +421,15 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. // Build a profile for the image config and then use that to build the boot image. profile := bootImageProfileRule(ctx, imageConfig) - buildBootImage(ctx, imageConfig, profile) + + // Build boot image files for the android variants. + androidBootImageFilesByArch := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile) + + // Zip the android variant boot image files up. + buildBootImageZipInPredefinedLocation(ctx, imageConfig, androidBootImageFilesByArch) + + // Build boot image files for the host variants. There are use directly by ART host side tests. + buildBootImageVariantsForBuildOs(ctx, imageConfig, profile) dumpOatRules(ctx, imageConfig) } |