Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1ad5a19 authored Apr 18, 2022 by Yu Liu Committed by Automerger Merge Worker Apr 18, 2022

Merge "Support use_version_lib in cc_binary." am: d683fc45 am: fcb1eeb6 am: 06253ff2

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

Change-Id: I0d120dfe500f2045a86cf20b5e833a5866dd7cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 61ccb035 06253ff2

bp2build/cc_binary_conversion_test.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -130,6 +130,7 @@ func TestBasicCcBinary(t *testing.T) {
		},
		sdk_version: "current",
		min_sdk_version: "29",
		use_version_lib: true,
		}
		`,
		targets: []testBazelTarget{
		@@ -155,6 +156,7 @@ func TestBasicCcBinary(t *testing.T) {
		}`,
		"sdk_version": `"current"`,
		"min_sdk_version": `"29"`,
		"use_version_lib": `True`,
		},
		},
		},

bp2build/cc_library_conversion_test.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ cc_library {
		include_build_directory: false,
		sdk_version: "current",
		min_sdk_version: "29",
		use_version_lib: true,
		}
		`,
		expectedBazelTargets: makeCcLibraryTargets("foo-lib", attrNameToString{
		@@ -144,6 +145,7 @@ cc_library {
		})`,
		"sdk_version": `"current"`,
		"min_sdk_version": `"29"`,
		"use_version_lib": `True`,
		}),
		})
		}

cc/binary.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -615,6 +615,7 @@ func binaryBp2build(ctx android.TopDownMutatorContext, m *Module, typ string) {
		Linkopts: baseAttrs.linkopts,
		Link_crt: baseAttrs.linkCrt,
		Use_libcrt: baseAttrs.useLibcrt,
		Use_version_lib: baseAttrs.useVersionLib,
		Rtti: baseAttrs.rtti,
		Stl: baseAttrs.stl,
		Cpp_std: baseAttrs.cppStd,
		@@ -667,6 +668,7 @@ type binaryAttributes struct {

		Link_crt bazel.BoolAttribute
		Use_libcrt bazel.BoolAttribute
		Use_version_lib bazel.BoolAttribute

		Rtti bazel.BoolAttribute
		Stl *string

cc/library.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
		Stl: compilerAttrs.stl,
		Cpp_std: compilerAttrs.cppStd,
		C_std: compilerAttrs.cStd,
		Use_version_lib: linkerAttrs.useVersionLib,

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

		Additional_linker_inputs: linkerAttrs.additionalLinkerInputs,