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

Merge "Support use_version_lib in cc_binary." am: d683fc45a3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2036969

Change-Id: I10d54f70d10d820b8a73f072e6a364397adaf431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2022-04-18 19:25:06 +00:00
committed by Automerger Merge Worker
parent b6289c9bbe d683fc45a3
commit fcb1eeb60e
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/cc_binary_conversion_test.go
View File

@@ -130,6 +130,7 @@ func TestBasicCcBinary(t *testing.T) {
}, },
sdk_version: "current", sdk_version: "current",
min_sdk_version: "29", min_sdk_version: "29",
use_version_lib: true,
} }
`, `,
targets: []testBazelTarget{ targets: []testBazelTarget{
@@ -153,8 +154,9 @@ func TestBasicCcBinary(t *testing.T) {
"keep_symbols_list": ["symbol"], "keep_symbols_list": ["symbol"],
"none": True, "none": True,
}`, }`,
"sdk_version": `"current"`, "sdk_version": `"current"`,
"min_sdk_version": `"29"`, "min_sdk_version": `"29"`,
"use_version_lib": `True`,
}, },
}, },
}, },

6
bp2build/cc_library_conversion_test.go
View File

@@ -117,6 +117,7 @@ cc_library {
include_build_directory: false, include_build_directory: false,
sdk_version: "current", sdk_version: "current",
min_sdk_version: "29", min_sdk_version: "29",
use_version_lib: true,
} }
`, `,
expectedBazelTargets: makeCcLibraryTargets("foo-lib", attrNameToString{ expectedBazelTargets: makeCcLibraryTargets("foo-lib", attrNameToString{
@@ -142,8 +143,9 @@ cc_library {
"//build/bazel/platforms/os:linux_bionic": ["bionic.cpp"], "//build/bazel/platforms/os:linux_bionic": ["bionic.cpp"],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"sdk_version": `"current"`, "sdk_version": `"current"`,
"min_sdk_version": `"29"`, "min_sdk_version": `"29"`,
"use_version_lib": `True`,
}), }),
}) })
} }

6
cc/binary.go
View File

@@ -615,6 +615,7 @@ func binaryBp2build(ctx android.TopDownMutatorContext, m *Module, typ string) {
Linkopts: baseAttrs.linkopts, Linkopts: baseAttrs.linkopts,
Link_crt: baseAttrs.linkCrt, Link_crt: baseAttrs.linkCrt,
Use_libcrt: baseAttrs.useLibcrt, Use_libcrt: baseAttrs.useLibcrt,
Use_version_lib: baseAttrs.useVersionLib,
Rtti: baseAttrs.rtti, Rtti: baseAttrs.rtti,
Stl: baseAttrs.stl, Stl: baseAttrs.stl,
Cpp_std: baseAttrs.cppStd, Cpp_std: baseAttrs.cppStd,
@@ -665,8 +666,9 @@ type binaryAttributes struct {
Linkopts bazel.StringListAttribute Linkopts bazel.StringListAttribute
Additional_linker_inputs bazel.LabelListAttribute Additional_linker_inputs bazel.LabelListAttribute
Link_crt bazel.BoolAttribute Link_crt bazel.BoolAttribute
Use_libcrt bazel.BoolAttribute Use_libcrt bazel.BoolAttribute
Use_version_lib bazel.BoolAttribute
Rtti bazel.BoolAttribute Rtti bazel.BoolAttribute
Stl *string Stl *string

2
cc/library.go
View File

@@ -352,6 +352,7 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
Stl: compilerAttrs.stl, Stl: compilerAttrs.stl,
Cpp_std: compilerAttrs.cppStd, Cpp_std: compilerAttrs.cppStd,
C_std: compilerAttrs.cStd, C_std: compilerAttrs.cStd,
Use_version_lib: linkerAttrs.useVersionLib,
Features: linkerAttrs.features, Features: linkerAttrs.features,
} }
@@ -374,6 +375,7 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
Stl: compilerAttrs.stl, Stl: compilerAttrs.stl,
Cpp_std: compilerAttrs.cppStd, Cpp_std: compilerAttrs.cppStd,
C_std: compilerAttrs.cStd, C_std: compilerAttrs.cStd,
Use_version_lib: linkerAttrs.useVersionLib,
Additional_linker_inputs: linkerAttrs.additionalLinkerInputs, Additional_linker_inputs: linkerAttrs.additionalLinkerInputs,