Merge changes from topic "clang-tidy-mixed-builds"
* changes: add tidy files to mixed builds add --norun_validations to bazel build action
This commit is contained in:
@@ -571,7 +571,9 @@ func (r *builtinBazelRunner) createBazelCommand(paths *bazelPaths, runName bazel
|
|||||||
|
|
||||||
// Suppress noise
|
// Suppress noise
|
||||||
"--ui_event_filters=-INFO",
|
"--ui_event_filters=-INFO",
|
||||||
"--noshow_progress"}
|
"--noshow_progress",
|
||||||
|
"--norun_validations",
|
||||||
|
}
|
||||||
cmdFlags = append(cmdFlags, extraFlags...)
|
cmdFlags = append(cmdFlags, extraFlags...)
|
||||||
|
|
||||||
bazelCmd := exec.Command(paths.bazelPath, cmdFlags...)
|
bazelCmd := exec.Command(paths.bazelPath, cmdFlags...)
|
||||||
|
@@ -30,6 +30,7 @@ type CcInfo struct {
|
|||||||
// be a subset of OutputFiles. (or shared libraries, this will be equal to OutputFiles,
|
// be a subset of OutputFiles. (or shared libraries, this will be equal to OutputFiles,
|
||||||
// but general cc_library will also have dynamic libraries in output files).
|
// but general cc_library will also have dynamic libraries in output files).
|
||||||
RootDynamicLibraries []string
|
RootDynamicLibraries []string
|
||||||
|
TidyFiles []string
|
||||||
TocFile string
|
TocFile string
|
||||||
UnstrippedOutput string
|
UnstrippedOutput string
|
||||||
}
|
}
|
||||||
@@ -165,6 +166,12 @@ else:
|
|||||||
# NOTE: It's OK if there's no ToC, as Soong just uses it for optimization
|
# NOTE: It's OK if there's no ToC, as Soong just uses it for optimization
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
tidy_files = []
|
||||||
|
p = providers(target)
|
||||||
|
clang_tidy_info = p.get("//build/bazel/rules/cc:clang_tidy.bzl%ClangTidyInfo")
|
||||||
|
if clang_tidy_info:
|
||||||
|
tidy_files = [v.path for v in clang_tidy_info.tidy_files.to_list()]
|
||||||
|
|
||||||
return json_encode({
|
return json_encode({
|
||||||
"OutputFiles": outputFiles,
|
"OutputFiles": outputFiles,
|
||||||
"CcObjectFiles": ccObjectFiles,
|
"CcObjectFiles": ccObjectFiles,
|
||||||
@@ -175,6 +182,7 @@ return json_encode({
|
|||||||
"Headers": headers,
|
"Headers": headers,
|
||||||
"RootStaticArchives": rootStaticArchives,
|
"RootStaticArchives": rootStaticArchives,
|
||||||
"RootDynamicLibraries": rootSharedLibraries,
|
"RootDynamicLibraries": rootSharedLibraries,
|
||||||
|
"TidyFiles": tidy_files,
|
||||||
"TocFile": toc_file,
|
"TocFile": toc_file,
|
||||||
"UnstrippedOutput": unstripped,
|
"UnstrippedOutput": unstripped,
|
||||||
})`
|
})`
|
||||||
|
5
cc/cc.go
5
cc/cc.go
@@ -1853,6 +1853,11 @@ func (c *Module) IsMixedBuildSupported(ctx android.BaseModuleContext) bool {
|
|||||||
func (c *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) {
|
func (c *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) {
|
||||||
bazelModuleLabel := c.getBazelModuleLabel(ctx)
|
bazelModuleLabel := c.getBazelModuleLabel(ctx)
|
||||||
|
|
||||||
|
bazelCtx := ctx.Config().BazelContext
|
||||||
|
if ccInfo, err := bazelCtx.GetCcInfo(bazelModuleLabel, android.GetConfigKey(ctx)); err == nil {
|
||||||
|
c.tidyFiles = android.PathsForBazelOut(ctx, ccInfo.TidyFiles)
|
||||||
|
}
|
||||||
|
|
||||||
c.bazelHandler.ProcessBazelQueryResponse(ctx, bazelModuleLabel)
|
c.bazelHandler.ProcessBazelQueryResponse(ctx, bazelModuleLabel)
|
||||||
|
|
||||||
c.Properties.SubName = GetSubnameProperty(ctx, c)
|
c.Properties.SubName = GetSubnameProperty(ctx, c)
|
||||||
|
Reference in New Issue
Block a user