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

Commit 2f9953b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dedupe libraries in both static and whole static" am: 6876d5aa am:... 

Merge "Dedupe libraries in both static and whole static" am: 6876d5aa am: 0c576c59 am: 509c730e

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



Change-Id: Iead517d8e7d92144ed625b2f0b2b04f7808acfac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 819aabba 509c730e

bp2build/cc_library_conversion_test.go

+9 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ cc_library { 
    srcs: ["both.cpp"],

    cflags: ["bothflag"],

    shared_libs: ["shared_dep_for_both"],

    static_libs: ["static_dep_for_both"],

    whole_static_libs: ["whole_static_lib_for_both"],

    static_libs: ["static_dep_for_both", "whole_and_static_lib_for_both"],

    whole_static_libs: ["whole_static_lib_for_both", "whole_and_static_lib_for_both"],

    static: {

        srcs: ["staticonly.cpp"],

        cflags: ["staticflag"],
@@ -332,6 +332,11 @@ cc_library_static { 
    bazel_module: { bp2build_available: false },

}



cc_library_static {

    name: "whole_and_static_lib_for_both",

    bazel_module: { bp2build_available: false },

}



cc_library {

    name: "shared_dep_for_shared",

    bazel_module: { bp2build_available: false },
@@ -367,6 +372,7 @@ cc_library { 
    ]`,

				"whole_archive_deps": `[

        ":whole_static_lib_for_both",

        ":whole_and_static_lib_for_both",

        ":whole_static_lib_for_static",

    ]`}),

			makeBazelTarget("cc_library_shared", "a", attrNameToString{
@@ -388,6 +394,7 @@ cc_library { 
    ]`,

				"whole_archive_deps": `[

        ":whole_static_lib_for_both",

        ":whole_and_static_lib_for_both",

        ":whole_static_lib_for_shared",

    ]`,

			}),

cc/bp2build.go

+4 −4
Original line number Diff line number Diff line
@@ -585,9 +585,12 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion 
	// Use a single variable to capture usage of nocrt in arch variants, so there's only 1 error message for this module

	var axisFeatures []string



	wholeStaticLibs := android.FirstUniqueStrings(props.Whole_static_libs)

	la.wholeArchiveDeps.SetSelectValue(axis, config, bazelLabelForWholeDepsExcludes(ctx, wholeStaticLibs, props.Exclude_static_libs))

	// Excludes to parallel Soong:

	// https://cs.android.com/android/platform/superproject/+/master:build/soong/cc/linker.go;l=247-249;drc=088b53577dde6e40085ffd737a1ae96ad82fc4b0

	staticLibs := android.FirstUniqueStrings(props.Static_libs)

	staticLibs := android.FirstUniqueStrings(android.RemoveListFromList(props.Static_libs, wholeStaticLibs))



	staticDeps := maybePartitionExportedAndImplementationsDepsExcludes(ctx, !isBinary, staticLibs, props.Exclude_static_libs, props.Export_static_lib_headers, bazelLabelForStaticDepsExcludes)



	headerLibs := android.FirstUniqueStrings(props.Header_libs)
@@ -599,9 +602,6 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion 
	(&hDeps.implementation).Append(staticDeps.implementation)

	la.implementationDeps.SetSelectValue(axis, config, hDeps.implementation)



	wholeStaticLibs := android.FirstUniqueStrings(props.Whole_static_libs)

	la.wholeArchiveDeps.SetSelectValue(axis, config, bazelLabelForWholeDepsExcludes(ctx, wholeStaticLibs, props.Exclude_static_libs))



	systemSharedLibs := props.System_shared_libs

	// systemSharedLibs distinguishes between nil/empty list behavior:

	//    nil -> use default values