Merge "Add -{checkbuild,tidy} targets only for modules in mm" am: 7b2239f648 am: 6ac43742fc

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

Change-Id: I80f4d3794d8592c5ae918074d461ace8254bfcfe
This commit is contained in:
Chih-hung Hsieh
2021-10-30 04:43:07 +00:00
committed by Automerger Merge Worker

View File

@@ -1768,8 +1768,14 @@ func (m *ModuleBase) generateModuleTarget(ctx ModuleContext) {
ctx.VisitAllModuleVariants(func(module Module) {
a := module.base()
allInstalledFiles = append(allInstalledFiles, a.installFiles...)
// A module's -{checkbuild,tidy} phony targets should
// not be created if the module is not exported to make.
// Those could depend on the build target and fail to compile
// for the current build target.
if !ctx.Config().KatiEnabled() || !shouldSkipAndroidMkProcessing(a) {
allCheckbuildFiles = append(allCheckbuildFiles, a.checkbuildFiles...)
allTidyFiles = append(allTidyFiles, a.tidyFiles...)
}
})
var deps Paths