diff options
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/cc/library.go b/cc/library.go index 0cffd5667..d63acfbf7 100644 --- a/cc/library.go +++ b/cc/library.go @@ -248,11 +248,13 @@ type bazelCcLibraryAttributes struct { Linkopts bazel.StringListAttribute Use_libcrt bazel.BoolAttribute Rtti bazel.BoolAttribute - Stl *string + + Stl *string + Cpp_std *string // This is shared only. - Version_script bazel.LabelAttribute - Link_crt bazel.BoolAttribute + Link_crt bazel.BoolAttribute + Additional_linker_inputs bazel.LabelListAttribute // Common properties shared between both shared and static variants. Shared staticOrSharedAttributes @@ -328,8 +330,9 @@ func CcLibraryBp2Build(ctx android.TopDownMutatorContext) { Use_libcrt: linkerAttrs.useLibcrt, Rtti: compilerAttrs.rtti, Stl: compilerAttrs.stl, + Cpp_std: compilerAttrs.cppStd, - Version_script: linkerAttrs.versionScript, + Additional_linker_inputs: linkerAttrs.additionalLinkerInputs, Strip: stripAttributes{ Keep_symbols: linkerAttrs.stripKeepSymbols, @@ -636,7 +639,7 @@ func (handler *ccLibraryBazelHandler) generateSharedBazelBuildActions(ctx androi func (handler *ccLibraryBazelHandler) GenerateBazelBuildActions(ctx android.ModuleContext, label string) bool { bazelCtx := ctx.Config().BazelContext - ccInfo, ok, err := bazelCtx.GetCcInfo(label, ctx.Arch().ArchType) + ccInfo, ok, err := bazelCtx.GetCcInfo(label, android.GetConfigKey(ctx)) if err != nil { ctx.ModuleErrorf("Error getting Bazel CcInfo: %s", err) return false @@ -2399,10 +2402,10 @@ func ccSharedOrStaticBp2BuildMutatorInternal(ctx android.TopDownMutatorContext, attrs = &bazelCcLibraryStaticAttributes{ staticOrSharedAttributes: commonAttrs, - Linkopts: linkerAttrs.linkopts, Use_libcrt: linkerAttrs.useLibcrt, Rtti: compilerAttrs.rtti, Stl: compilerAttrs.stl, + Cpp_std: compilerAttrs.cppStd, Export_includes: exportedIncludes.Includes, Export_system_includes: exportedIncludes.SystemIncludes, Local_includes: compilerAttrs.localIncludes, @@ -2427,12 +2430,13 @@ func ccSharedOrStaticBp2BuildMutatorInternal(ctx android.TopDownMutatorContext, Use_libcrt: linkerAttrs.useLibcrt, Rtti: compilerAttrs.rtti, Stl: compilerAttrs.stl, + Cpp_std: compilerAttrs.cppStd, - Export_includes: exportedIncludes.Includes, - Export_system_includes: exportedIncludes.SystemIncludes, - Local_includes: compilerAttrs.localIncludes, - Absolute_includes: compilerAttrs.absoluteIncludes, - Version_script: linkerAttrs.versionScript, + Export_includes: exportedIncludes.Includes, + Export_system_includes: exportedIncludes.SystemIncludes, + Local_includes: compilerAttrs.localIncludes, + Absolute_includes: compilerAttrs.absoluteIncludes, + Additional_linker_inputs: linkerAttrs.additionalLinkerInputs, Strip: stripAttributes{ Keep_symbols: linkerAttrs.stripKeepSymbols, @@ -2458,10 +2462,10 @@ func ccSharedOrStaticBp2BuildMutatorInternal(ctx android.TopDownMutatorContext, type bazelCcLibraryStaticAttributes struct { staticOrSharedAttributes - Linkopts bazel.StringListAttribute Use_libcrt bazel.BoolAttribute Rtti bazel.BoolAttribute Stl *string + Cpp_std *string Export_includes bazel.StringListAttribute Export_system_includes bazel.StringListAttribute @@ -2489,6 +2493,7 @@ type bazelCcLibrarySharedAttributes struct { Use_libcrt bazel.BoolAttribute Rtti bazel.BoolAttribute Stl *string + Cpp_std *string Export_includes bazel.StringListAttribute Export_system_includes bazel.StringListAttribute @@ -2496,8 +2501,8 @@ type bazelCcLibrarySharedAttributes struct { Absolute_includes bazel.StringListAttribute Hdrs bazel.LabelListAttribute - Strip stripAttributes - Version_script bazel.LabelAttribute + Strip stripAttributes + Additional_linker_inputs bazel.LabelListAttribute Cppflags bazel.StringListAttribute Conlyflags bazel.StringListAttribute |