bp2build: support full/lite protos in cc libs
Test: bp2build.sh Bug: 200601772 Change-Id: I3a7e00546726bc63b5eb8d5604557c5988a5320b
This commit is contained in:
10
cc/binary.go
10
cc/binary.go
@@ -18,6 +18,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
"github.com/google/blueprint/proptools"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/bazel"
|
||||
@@ -578,9 +579,16 @@ func binaryBp2build(ctx android.TopDownMutatorContext, typ string) {
|
||||
}
|
||||
|
||||
baseAttrs := bp2BuildParseBaseProps(ctx, m)
|
||||
binaryLinkerAttrs := bp2buildBinaryLinkerProps(ctx, m)
|
||||
|
||||
if proptools.BoolDefault(binaryLinkerAttrs.Linkshared, true) {
|
||||
baseAttrs.implementationDynamicDeps.Add(baseAttrs.protoDependency)
|
||||
} else {
|
||||
baseAttrs.implementationDeps.Add(baseAttrs.protoDependency)
|
||||
}
|
||||
|
||||
attrs := &binaryAttributes{
|
||||
binaryLinkerAttrs: bp2buildBinaryLinkerProps(ctx, m),
|
||||
binaryLinkerAttrs: binaryLinkerAttrs,
|
||||
|
||||
Srcs: baseAttrs.srcs,
|
||||
Srcs_c: baseAttrs.cSrcs,
|
||||
|
Reference in New Issue
Block a user