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

Support rtti in bp2build

Browse Source 
Rtti was already handled by bazel macros, so this change simply
propagates the rtti bit to these macros.

Test: Run bp2build, build //external/libcxxabi:all
Change-Id: I63296db2db868202874c8bd0b1de6310f7bb85c7
This commit is contained in:
Chris Parsons
2021-08-10 11:58:07 -04:00
parent 8f34b0e19d
commit 2c7883941e
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/library.go
View File

@@ -236,6 +236,7 @@ type bazelCcLibraryAttributes struct {
Includes bazel.StringListAttribute
Linkopts bazel.StringListAttribute
Use_libcrt bazel.BoolAttribute
Rtti bazel.BoolAttribute
// This is shared only.
Version_script bazel.LabelAttribute
@@ -323,6 +324,7 @@ func CcLibraryBp2Build(ctx android.TopDownMutatorContext) {
Includes: exportedIncludes,
Linkopts: linkerAttrs.linkopts,
Use_libcrt: linkerAttrs.useLibcrt,
Rtti: compilerAttrs.rtti,
Version_script: linkerAttrs.versionScript,
@@ -2335,6 +2337,7 @@ type bazelCcLibraryStaticAttributes struct {
Linkopts bazel.StringListAttribute
Linkstatic bool
Use_libcrt bazel.BoolAttribute
Rtti bazel.BoolAttribute
Includes bazel.StringListAttribute
Hdrs bazel.LabelListAttribute
@@ -2396,6 +2399,7 @@ func ccLibraryStaticBp2BuildInternal(ctx android.TopDownMutatorContext, module *
Linkopts: linkerAttrs.linkopts,
Linkstatic: true,
Use_libcrt: linkerAttrs.useLibcrt,
Rtti: compilerAttrs.rtti,
Includes: exportedIncludes,
Cppflags: compilerAttrs.cppFlags,