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

Commit d683fc45 authored by Yu Liu's avatar Yu Liu Committed by Gerrit Code Review
Browse files

Merge "Support use_version_lib in cc_binary."

parents 3736abfa a79c946f

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,