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

Split local/absolute include into attributes

Browse Source 
Previously these were expanded into copts, requiring making all includes
absolute and duplicating includes to account for potentially generated
files. We now can handle both of these properly on the Bazel side, so
let's clean up build files a bit.

Test: bp2build.sh
Change-Id: I6c6160738cd6c269408c6c7a37010654d84f3c9d
This commit is contained in:
Liz Kammer
2021-09-10 10:07:07 -04:00
parent 8337ea4e7d
commit 35687bc77a
8 changed files with 84 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
bp2build/cc_library_static_conversion_test.go
View File

@@ -184,19 +184,13 @@ cc_library_static {
}`,
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
absolute_includes = [
"include_dir_1",
"include_dir_2",
],
copts = [
"-Dflag1",
"-Dflag2",
"-Iinclude_dir_1",
"-I$(BINDIR)/include_dir_1",
"-Iinclude_dir_2",
"-I$(BINDIR)/include_dir_2",
"-Ilocal_include_dir_1",
"-I$(BINDIR)/local_include_dir_1",
"-Ilocal_include_dir_2",
"-I$(BINDIR)/local_include_dir_2",
"-I.",
"-I$(BINDIR)/.",
],
export_includes = [
"export_include_dir_1",
@@ -209,6 +203,11 @@ cc_library_static {
":static_lib_2",
],
linkstatic = True,
local_includes = [
"local_include_dir_1",
"local_include_dir_2",
".",
],
srcs = [
"foo_static1.cc",
"foo_static2.cc",
@@ -244,21 +243,16 @@ func TestCcLibraryStaticSubpackage(t *testing.T) {
blueprint: soongCcLibraryStaticPreamble + `
cc_library_static {
name: "foo_static",
srcs: [
],
srcs: [],
include_dirs: [
"subpackage",
"subpackage",
],
}`,
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = [
"-Isubpackage",
"-I$(BINDIR)/subpackage",
"-I.",
"-I$(BINDIR)/.",
],
absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = ["."],
)`},
})
}
@@ -347,20 +341,17 @@ cc_library_static {
blueprint: soongCcLibraryStaticPreamble,
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = [
"-Isubpackage/subsubpackage",
"-I$(BINDIR)/subpackage/subsubpackage",
"-Isubpackage2",
"-I$(BINDIR)/subpackage2",
"-Isubpackage3/subsubpackage",
"-I$(BINDIR)/subpackage3/subsubpackage",
"-Isubpackage/subsubpackage2",
"-I$(BINDIR)/subpackage/subsubpackage2",
"-Isubpackage",
"-I$(BINDIR)/subpackage",
absolute_includes = [
"subpackage/subsubpackage",
"subpackage2",
"subpackage3/subsubpackage",
],
export_includes = ["./exported_subsubpackage"],
linkstatic = True,
local_includes = [
"subsubpackage2",
".",
],
)`},
})
}
@@ -386,13 +377,9 @@ cc_library_static {
}`,
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = [
"-Isubpackage",
"-I$(BINDIR)/subpackage",
"-Isubpackage2",
"-I$(BINDIR)/subpackage2",
],
absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = ["subpackage2"],
)`},
})
}
@@ -420,15 +407,12 @@ cc_library_static {
}`,
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = [
"-Isubpackage",
"-I$(BINDIR)/subpackage",
"-Isubpackage2",
"-I$(BINDIR)/subpackage2",
"-I.",
"-I$(BINDIR)/.",
],
absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = [
"subpackage2",
".",
],
)`},
})
}