Merge "Create empty monolithic hiddenapi flags files for non java devices." into main
This commit is contained in:
@@ -294,6 +294,15 @@ func (b *platformBootclasspathModule) checkApexModules(ctx android.ModuleContext
|
|||||||
|
|
||||||
// generateHiddenAPIBuildActions generates all the hidden API related build rules.
|
// generateHiddenAPIBuildActions generates all the hidden API related build rules.
|
||||||
func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.Module, fragments []android.Module) bootDexJarByModule {
|
func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.Module, fragments []android.Module) bootDexJarByModule {
|
||||||
|
createEmptyHiddenApiFiles := func() {
|
||||||
|
paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV}
|
||||||
|
for _, path := range paths {
|
||||||
|
ctx.Build(pctx, android.BuildParams{
|
||||||
|
Rule: android.Touch,
|
||||||
|
Output: path,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Save the paths to the monolithic files for retrieval via OutputFiles().
|
// Save the paths to the monolithic files for retrieval via OutputFiles().
|
||||||
b.hiddenAPIFlagsCSV = hiddenAPISingletonPaths(ctx).flags
|
b.hiddenAPIFlagsCSV = hiddenAPISingletonPaths(ctx).flags
|
||||||
@@ -306,13 +315,7 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.
|
|||||||
// optimization that can be used to reduce the incremental build time but as its name suggests it
|
// optimization that can be used to reduce the incremental build time but as its name suggests it
|
||||||
// can be unsafe to use, e.g. when the changes affect anything that goes on the bootclasspath.
|
// can be unsafe to use, e.g. when the changes affect anything that goes on the bootclasspath.
|
||||||
if ctx.Config().DisableHiddenApiChecks() {
|
if ctx.Config().DisableHiddenApiChecks() {
|
||||||
paths := android.OutputPaths{b.hiddenAPIFlagsCSV, b.hiddenAPIIndexCSV, b.hiddenAPIMetadataCSV}
|
createEmptyHiddenApiFiles()
|
||||||
for _, path := range paths {
|
|
||||||
ctx.Build(pctx, android.BuildParams{
|
|
||||||
Rule: android.Touch,
|
|
||||||
Output: path,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return bootDexJarByModule
|
return bootDexJarByModule
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,6 +330,8 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.
|
|||||||
|
|
||||||
if len(classesJars) == 0 {
|
if len(classesJars) == 0 {
|
||||||
// This product does not include any monolithic jars. Monolithic hiddenapi flag generation is not required.
|
// This product does not include any monolithic jars. Monolithic hiddenapi flag generation is not required.
|
||||||
|
// However, generate an empty file so that the dist tags in f/b/boot/Android.bp can be resolved, and `m dist` works.
|
||||||
|
createEmptyHiddenApiFiles()
|
||||||
return bootDexJarByModule
|
return bootDexJarByModule
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user