StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bp2build: remove header globs in generated srcs.

Browse Source 
Not needed anymore for bp2build-incremental since https://android-review.googlesource.com/q/topic:no-include-check.

Not needed for mixed builds either, since cc compile actions aren't sandboxed.

Fixes: 186488830
Test: treehugger and go tests

Change-Id: Ib5d4908dcce6bf910a653c457bb251d726e717d4
This commit is contained in:
Jingwen Chen
2021-04-27 05:54:20 +00:00
parent c30d7beb8f
commit 882bcc1c1c
8 changed files with 14 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bazel/properties.go
View File

@@ -64,43 +64,6 @@ type LabelList struct {
Excludes []Label Excludes []Label
} }
// GlobsInDir returns a list of glob expressions for a list of extensions
// (optionally recursive) within a directory.
func GlobsInDir(dir string, recursive bool, extensions []string) []string {
globs := []string{}
globInfix := ""
if dir == "." {
if recursive {
// e.g "**/*.h"
globInfix = "**/"
} // else e.g. "*.h"
for _, ext := range extensions {
globs = append(globs, globInfix+"*"+ext)
}
} else {
if recursive {
// e.g. "foo/bar/**/*.h"
dir += "/**"
} // else e.g. "foo/bar/*.h"
for _, ext := range extensions {
globs = append(globs, dir+"/*"+ext)
}
}
return globs
}
// LooseHdrsGlobs returns the list of non-recursive header globs for each parent directory of
// each source file in this LabelList's Includes.
func (ll *LabelList) LooseHdrsGlobs(exts []string) []string {
var globs []string
for _, parentDir := range ll.uniqueParentDirectories() {
globs = append(globs,
GlobsInDir(parentDir, false, exts)...)
}
return globs
}
// uniqueParentDirectories returns a list of the unique parent directories for // uniqueParentDirectories returns a list of the unique parent directories for
// all files in ll.Includes. // all files in ll.Includes.
func (ll *LabelList) uniqueParentDirectories() []string { func (ll *LabelList) uniqueParentDirectories() []string {

23
bp2build/cc_library_conversion_test.go
View File

@@ -114,26 +114,13 @@ cc_library {
"-I.", "-I.",
], ],
deps = [":some-headers"], deps = [":some-headers"],
hdrs = ["foo-dir/a.h"],
includes = ["foo-dir"], includes = ["foo-dir"],
linkopts = ["-Wl,--exclude-libs=bar.a"] + select({ linkopts = ["-Wl,--exclude-libs=bar.a"] + select({
"//build/bazel/platforms/arch:x86": ["-Wl,--exclude-libs=baz.a"], "//build/bazel/platforms/arch:x86": ["-Wl,--exclude-libs=baz.a"],
"//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=qux.a"], "//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=qux.a"],
"//conditions:default": [], "//conditions:default": [],
}), }),
srcs = [ srcs = ["impl.cpp"] + select({
"impl.cpp",
"header.h",
"foo-dir/a.h",
"header.hh",
"header.hpp",
"header.hxx",
"header.h++",
"header.inl",
"header.inc",
"header.ipp",
"header.h.generic",
] + select({
"//build/bazel/platforms/arch:x86": ["x86.cpp"], "//build/bazel/platforms/arch:x86": ["x86.cpp"],
"//build/bazel/platforms/arch:x86_64": ["x86_64.cpp"], "//build/bazel/platforms/arch:x86_64": ["x86_64.cpp"],
"//conditions:default": [], "//conditions:default": [],
@@ -209,13 +196,7 @@ cc_library {
"//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=libgcc_eh.a"], "//build/bazel/platforms/arch:x86_64": ["-Wl,--exclude-libs=libgcc_eh.a"],
"//conditions:default": [], "//conditions:default": [],
}), }),
srcs = [ srcs = ["ld_android.cpp"],
"ld_android.cpp",
"linked_list.h",
"linker.h",
"linker_block_allocator.h",
"linker_cfi.h",
],
)`}, )`},
}, },
} }

19
bp2build/cc_library_headers_conversion_test.go
View File

@@ -136,17 +136,6 @@ cc_library_headers {
":lib-1", ":lib-1",
":lib-2", ":lib-2",
], ],
hdrs = [
"dir-1/dir1a.h",
"dir-1/dir1b.h",
"dir-2/dir2a.h",
"dir-2/dir2b.h",
] + select({
"//build/bazel/platforms/arch:arm64": ["arch_arm64_exported_include_dir/a.h"],
"//build/bazel/platforms/arch:x86": ["arch_x86_exported_include_dir/b.h"],
"//build/bazel/platforms/arch:x86_64": ["arch_x86_64_exported_include_dir/c.h"],
"//conditions:default": [],
}),
includes = [ includes = [
"dir-1", "dir-1",
"dir-2", "dir-2",
@@ -159,18 +148,10 @@ cc_library_headers {
)`, `cc_library_headers( )`, `cc_library_headers(
name = "lib-1", name = "lib-1",
copts = ["-I."], copts = ["-I."],
hdrs = [
"lib-1/lib1a.h",
"lib-1/lib1b.h",
],
includes = ["lib-1"], includes = ["lib-1"],
)`, `cc_library_headers( )`, `cc_library_headers(
name = "lib-2", name = "lib-2",
copts = ["-I."], copts = ["-I."],
hdrs = [
"lib-2/lib2a.h",
"lib-2/lib2b.h",
],
includes = ["lib-2"], includes = ["lib-2"],
)`}, )`},
}, },

127
bp2build/cc_library_static_conversion_test.go
View File

@@ -192,12 +192,6 @@ cc_library_static {
":whole_static_lib_1", ":whole_static_lib_1",
":whole_static_lib_2", ":whole_static_lib_2",
], ],
hdrs = [
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
],
includes = [ includes = [
"export_include_dir_1", "export_include_dir_1",
"export_include_dir_2", "export_include_dir_2",
@@ -206,105 +200,27 @@ cc_library_static {
srcs = [ srcs = [
"foo_static1.cc", "foo_static1.cc",
"foo_static2.cc", "foo_static2.cc",
"implicit_include_1.h",
"implicit_include_2.h",
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
"include_dir_1/include_dir_1_a.h",
"include_dir_1/include_dir_1_b.h",
"include_dir_2/include_dir_2_a.h",
"include_dir_2/include_dir_2_b.h",
"local_include_dir_1/local_include_dir_1_a.h",
"local_include_dir_1/local_include_dir_1_b.h",
"local_include_dir_2/local_include_dir_2_a.h",
"local_include_dir_2/local_include_dir_2_b.h",
], ],
)`, `cc_library_static( )`, `cc_library_static(
name = "static_lib_1", name = "static_lib_1",
copts = ["-I."], copts = ["-I."],
linkstatic = True, linkstatic = True,
srcs = [ srcs = ["static_lib_1.cc"],
"static_lib_1.cc",
"implicit_include_1.h",
"implicit_include_2.h",
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
"include_dir_1/include_dir_1_a.h",
"include_dir_1/include_dir_1_b.h",
"include_dir_2/include_dir_2_a.h",
"include_dir_2/include_dir_2_b.h",
"local_include_dir_1/local_include_dir_1_a.h",
"local_include_dir_1/local_include_dir_1_b.h",
"local_include_dir_2/local_include_dir_2_a.h",
"local_include_dir_2/local_include_dir_2_b.h",
],
)`, `cc_library_static( )`, `cc_library_static(
name = "static_lib_2", name = "static_lib_2",
copts = ["-I."], copts = ["-I."],
linkstatic = True, linkstatic = True,
srcs = [ srcs = ["static_lib_2.cc"],
"static_lib_2.cc",
"implicit_include_1.h",
"implicit_include_2.h",
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
"include_dir_1/include_dir_1_a.h",
"include_dir_1/include_dir_1_b.h",
"include_dir_2/include_dir_2_a.h",
"include_dir_2/include_dir_2_b.h",
"local_include_dir_1/local_include_dir_1_a.h",
"local_include_dir_1/local_include_dir_1_b.h",
"local_include_dir_2/local_include_dir_2_a.h",
"local_include_dir_2/local_include_dir_2_b.h",
],
)`, `cc_library_static( )`, `cc_library_static(
name = "whole_static_lib_1", name = "whole_static_lib_1",
copts = ["-I."], copts = ["-I."],
linkstatic = True, linkstatic = True,
srcs = [ srcs = ["whole_static_lib_1.cc"],
"whole_static_lib_1.cc",
"implicit_include_1.h",
"implicit_include_2.h",
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
"include_dir_1/include_dir_1_a.h",
"include_dir_1/include_dir_1_b.h",
"include_dir_2/include_dir_2_a.h",
"include_dir_2/include_dir_2_b.h",
"local_include_dir_1/local_include_dir_1_a.h",
"local_include_dir_1/local_include_dir_1_b.h",
"local_include_dir_2/local_include_dir_2_a.h",
"local_include_dir_2/local_include_dir_2_b.h",
],
)`, `cc_library_static( )`, `cc_library_static(
name = "whole_static_lib_2", name = "whole_static_lib_2",
copts = ["-I."], copts = ["-I."],
linkstatic = True, linkstatic = True,
srcs = [ srcs = ["whole_static_lib_2.cc"],
"whole_static_lib_2.cc",
"implicit_include_1.h",
"implicit_include_2.h",
"export_include_dir_1/export_include_dir_1_a.h",
"export_include_dir_1/export_include_dir_1_b.h",
"export_include_dir_2/export_include_dir_2_a.h",
"export_include_dir_2/export_include_dir_2_b.h",
"include_dir_1/include_dir_1_a.h",
"include_dir_1/include_dir_1_b.h",
"include_dir_2/include_dir_2_a.h",
"include_dir_2/include_dir_2_b.h",
"local_include_dir_1/local_include_dir_1_a.h",
"local_include_dir_1/local_include_dir_1_b.h",
"local_include_dir_2/local_include_dir_2_a.h",
"local_include_dir_2/local_include_dir_2_b.h",
],
)`}, )`},
}, },
{ {
@@ -342,14 +258,6 @@ cc_library_static {
"-I.", "-I.",
], ],
linkstatic = True, linkstatic = True,
srcs = [
"//subpackage:subpackage_header.h",
"//subpackage:subdirectory/subdirectory_header.h",
"//subpackage/subsubpackage:subsubpackage_header.h",
"//subpackage/subsubpackage:subdirectory/subdirectory_header.h",
"//subpackage/subsubpackage/subsubsubpackage:subsubsubpackage_header.h",
"//subpackage/subsubpackage/subsubsubpackage:subdirectory/subdirectory_header.h",
],
)`}, )`},
}, },
{ {
@@ -371,16 +279,8 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
copts = ["-I."], copts = ["-I."],
hdrs = [
"//subpackage:subdirectory/subdirectory_header.h",
"//subpackage:subpackage_header.h",
],
includes = ["subpackage"], includes = ["subpackage"],
linkstatic = True, linkstatic = True,
srcs = [
"//subpackage:subpackage_header.h",
"//subpackage:subdirectory/subdirectory_header.h",
],
)`}, )`},
}, },
{ {
@@ -402,16 +302,8 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
copts = ["-I."], copts = ["-I."],
hdrs = [
"//subpackage:subdirectory/subdirectory_header.h",
"//subpackage:subpackage_header.h",
],
includes = ["subpackage"], includes = ["subpackage"],
linkstatic = True, linkstatic = True,
srcs = [
"//subpackage:subpackage_header.h",
"//subpackage:subdirectory/subdirectory_header.h",
],
)`}, )`},
}, },
{ {
@@ -452,14 +344,8 @@ cc_library_static {
"-Isubpackage/subsubpackage2", "-Isubpackage/subsubpackage2",
"-Isubpackage", "-Isubpackage",
], ],
hdrs = ["exported_subsubpackage/header.h"],
includes = ["./exported_subsubpackage"], includes = ["./exported_subsubpackage"],
linkstatic = True, linkstatic = True,
srcs = [
"exported_subsubpackage/header.h",
"subsubpackage/header.h",
"subsubpackage2/header.h",
],
)`}, )`},
}, },
{ {
@@ -517,11 +403,6 @@ cc_library_static {
"-I.", "-I.",
], ],
linkstatic = True, linkstatic = True,
srcs = [
"//subpackage:subpackage_header.h",
"//subpackage:subdirectory/subdirectory_header.h",
"//subpackage2:subpackage2_header.h",
],
)`}, )`},
}, },
{ {

6
bp2build/cc_object_conversion_test.go
View File

@@ -67,11 +67,7 @@ func TestCcObjectBp2Build(t *testing.T) {
"-Iinclude", "-Iinclude",
"-I.", "-I.",
], ],
srcs = [ srcs = ["a/b/c.c"],
"a/b/c.c",
"a/b/bar.h",
"a/b/foo.h",
],
)`, )`,
}, },
}, },

55
cc/bp2build.go
View File

@@ -80,7 +80,7 @@ type compilerAttributes struct {
// bp2BuildParseCompilerProps returns copts, srcs and hdrs and other attributes. // bp2BuildParseCompilerProps returns copts, srcs and hdrs and other attributes.
func bp2BuildParseCompilerProps(ctx android.TopDownMutatorContext, module *Module) compilerAttributes { func bp2BuildParseCompilerProps(ctx android.TopDownMutatorContext, module *Module) compilerAttributes {
var localHdrs, srcs bazel.LabelListAttribute var srcs bazel.LabelListAttribute
var copts bazel.StringListAttribute var copts bazel.StringListAttribute
// Creates the -I flag for a directory, while making the directory relative // Creates the -I flag for a directory, while making the directory relative
@@ -121,10 +121,8 @@ func bp2BuildParseCompilerProps(ctx android.TopDownMutatorContext, module *Modul
if c, ok := module.compiler.(*baseCompiler); ok && c.includeBuildDirectory() { if c, ok := module.compiler.(*baseCompiler); ok && c.includeBuildDirectory() {
copts.Value = append(copts.Value, includeFlag(".")) copts.Value = append(copts.Value, includeFlag("."))
localHdrs.Value = bp2BuildListHeadersInDir(ctx, ".")
} else if c, ok := module.compiler.(*libraryDecorator); ok && c.includeBuildDirectory() { } else if c, ok := module.compiler.(*libraryDecorator); ok && c.includeBuildDirectory() {
copts.Value = append(copts.Value, includeFlag(".")) copts.Value = append(copts.Value, includeFlag("."))
localHdrs.Value = bp2BuildListHeadersInDir(ctx, ".")
} }
for arch, props := range module.GetArchProperties(&BaseCompilerProperties{}) { for arch, props := range module.GetArchProperties(&BaseCompilerProperties{}) {
@@ -143,9 +141,6 @@ func bp2BuildParseCompilerProps(ctx android.TopDownMutatorContext, module *Modul
} }
} }
// Combine local, non-exported hdrs into srcs
srcs.Append(localHdrs)
return compilerAttributes{ return compilerAttributes{
srcs: srcs, srcs: srcs,
copts: copts, copts: copts,
@@ -207,11 +202,6 @@ func bp2BuildParseLinkerProps(ctx android.TopDownMutatorContext, module *Module)
} }
} }
func bp2BuildListHeadersInDir(ctx android.TopDownMutatorContext, includeDir string) bazel.LabelList {
globs := bazel.GlobsInDir(includeDir, true, headerExts)
return android.BazelLabelForModuleSrc(ctx, globs)
}
// Relativize a list of root-relative paths with respect to the module's // Relativize a list of root-relative paths with respect to the module's
// directory. // directory.
// //
@@ -236,9 +226,8 @@ func bp2BuildMakePathsRelativeToModule(ctx android.BazelConversionPathContext, p
} }
// bp2BuildParseExportedIncludes creates a string list attribute contains the // bp2BuildParseExportedIncludes creates a string list attribute contains the
// exported included directories of a module, and a label list attribute // exported included directories of a module.
// containing the exported headers of a module. func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Module) bazel.StringListAttribute {
func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Module) (bazel.StringListAttribute, bazel.LabelListAttribute) {
libraryDecorator := module.linker.(*libraryDecorator) libraryDecorator := module.linker.(*libraryDecorator)
// Export_system_include_dirs and export_include_dirs are already module dir // Export_system_include_dirs and export_include_dirs are already module dir
@@ -248,14 +237,6 @@ func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Mo
includeDirs = append(includeDirs, libraryDecorator.flagExporter.Properties.Export_include_dirs...) includeDirs = append(includeDirs, libraryDecorator.flagExporter.Properties.Export_include_dirs...)
includeDirsAttribute := bazel.MakeStringListAttribute(includeDirs) includeDirsAttribute := bazel.MakeStringListAttribute(includeDirs)
var headersAttribute bazel.LabelListAttribute
var headers bazel.LabelList
for _, includeDir := range includeDirs {
headers.Append(bp2BuildListHeadersInDir(ctx, includeDir))
}
headers = bazel.UniqueBazelLabelList(headers)
headersAttribute.Value = headers
for arch, props := range module.GetArchProperties(&FlagExporterProperties{}) { for arch, props := range module.GetArchProperties(&FlagExporterProperties{}) {
if flagExporterProperties, ok := props.(*FlagExporterProperties); ok { if flagExporterProperties, ok := props.(*FlagExporterProperties); ok {
archIncludeDirs := flagExporterProperties.Export_system_include_dirs archIncludeDirs := flagExporterProperties.Export_system_include_dirs
@@ -268,20 +249,6 @@ func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Mo
if len(archIncludeDirs) > 0 { if len(archIncludeDirs) > 0 {
includeDirsAttribute.SetValueForArch(arch.Name, archIncludeDirs) includeDirsAttribute.SetValueForArch(arch.Name, archIncludeDirs)
} }
var archHeaders bazel.LabelList
for _, archIncludeDir := range archIncludeDirs {
archHeaders.Append(bp2BuildListHeadersInDir(ctx, archIncludeDir))
}
archHeaders = bazel.UniqueBazelLabelList(archHeaders)
// To avoid duplicate headers when base headers + arch headers are combined
// FIXME: This doesn't take conflicts between arch and os includes into account
archHeaders = bazel.SubtractBazelLabelList(archHeaders, headers)
if len(archHeaders.Includes) > 0 || len(archHeaders.Excludes) > 0 {
headersAttribute.SetValueForArch(arch.Name, archHeaders)
}
} }
} }
@@ -297,22 +264,8 @@ func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Mo
if len(osIncludeDirs) > 0 { if len(osIncludeDirs) > 0 {
includeDirsAttribute.SetValueForOS(os.Name, osIncludeDirs) includeDirsAttribute.SetValueForOS(os.Name, osIncludeDirs)
} }
var osHeaders bazel.LabelList
for _, osIncludeDir := range osIncludeDirs {
osHeaders.Append(bp2BuildListHeadersInDir(ctx, osIncludeDir))
}
osHeaders = bazel.UniqueBazelLabelList(osHeaders)
// To avoid duplicate headers when base headers + os headers are combined
// FIXME: This doesn't take conflicts between arch and os includes into account
osHeaders = bazel.SubtractBazelLabelList(osHeaders, headers)
if len(osHeaders.Includes) > 0 || len(osHeaders.Excludes) > 0 {
headersAttribute.SetValueForOS(os.Name, osHeaders)
}
} }
} }
return includeDirsAttribute, headersAttribute return includeDirsAttribute
} }

6
cc/library.go
View File

@@ -259,11 +259,10 @@ func CcLibraryBp2Build(ctx android.TopDownMutatorContext) {
compilerAttrs := bp2BuildParseCompilerProps(ctx, m) compilerAttrs := bp2BuildParseCompilerProps(ctx, m)
linkerAttrs := bp2BuildParseLinkerProps(ctx, m) linkerAttrs := bp2BuildParseLinkerProps(ctx, m)
exportedIncludes, exportedIncludesHeaders := bp2BuildParseExportedIncludes(ctx, m) exportedIncludes := bp2BuildParseExportedIncludes(ctx, m)
attrs := &bazelCcLibraryAttributes{ attrs := &bazelCcLibraryAttributes{
Srcs: compilerAttrs.srcs, Srcs: compilerAttrs.srcs,
Hdrs: exportedIncludesHeaders,
Copts: compilerAttrs.copts, Copts: compilerAttrs.copts,
Linkopts: linkerAttrs.linkopts, Linkopts: linkerAttrs.linkopts,
Deps: linkerAttrs.deps, Deps: linkerAttrs.deps,
@@ -2176,7 +2175,7 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) {
compilerAttrs := bp2BuildParseCompilerProps(ctx, module) compilerAttrs := bp2BuildParseCompilerProps(ctx, module)
linkerAttrs := bp2BuildParseLinkerProps(ctx, module) linkerAttrs := bp2BuildParseLinkerProps(ctx, module)
exportedIncludes, exportedIncludesHeaders := bp2BuildParseExportedIncludes(ctx, module) exportedIncludes := bp2BuildParseExportedIncludes(ctx, module)
attrs := &bazelCcLibraryStaticAttributes{ attrs := &bazelCcLibraryStaticAttributes{
Copts: compilerAttrs.copts, Copts: compilerAttrs.copts,
@@ -2184,7 +2183,6 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) {
Deps: linkerAttrs.deps, Deps: linkerAttrs.deps,
Linkstatic: true, Linkstatic: true,
Includes: exportedIncludes, Includes: exportedIncludes,
Hdrs: exportedIncludesHeaders,
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{

3
cc/library_headers.go
View File

@@ -142,14 +142,13 @@ func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) {
return return
} }
exportedIncludes, exportedHdrs := bp2BuildParseExportedIncludes(ctx, module) exportedIncludes := bp2BuildParseExportedIncludes(ctx, module)
compilerAttrs := bp2BuildParseCompilerProps(ctx, module) compilerAttrs := bp2BuildParseCompilerProps(ctx, module)
linkerAttrs := bp2BuildParseLinkerProps(ctx, module) linkerAttrs := bp2BuildParseLinkerProps(ctx, module)
attrs := &bazelCcLibraryHeadersAttributes{ attrs := &bazelCcLibraryHeadersAttributes{
Copts: compilerAttrs.copts, Copts: compilerAttrs.copts,
Includes: exportedIncludes, Includes: exportedIncludes,
Hdrs: exportedHdrs,
Deps: linkerAttrs.deps, Deps: linkerAttrs.deps,
} }