libbuildversion should be linked as a whole archive dep as soong does.

Bug: 278789968
Test: Unit tests and CI
Change-Id: Ic2c44826bdc03b91cc19d93f96096ec6fdf44833
This commit is contained in:
Yu Liu
2023-04-24 16:37:18 -07:00
parent fdef3506c7
commit fe978fd2c1
4 changed files with 8 additions and 12 deletions

View File

@@ -156,7 +156,7 @@ cc_library {
"sdk_version": `"current"`,
"min_sdk_version": `"29"`,
"use_version_lib": `True`,
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
"whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
}),
})
}

View File

@@ -517,7 +517,7 @@ func TestCcLibrarySharedUseVersionLib(t *testing.T) {
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
"use_version_lib": "True",
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
"whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
}),
},
})

View File

@@ -1613,7 +1613,7 @@ func TestCcLibraryStaticUseVersionLib(t *testing.T) {
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo", AttrNameToString{
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
"whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
}),
},
})

View File

@@ -1036,11 +1036,7 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion
_, staticLibs = android.RemoveFromList(versionLib, staticLibs)
// only add the dep if it is not in progress
if !versionLibAlreadyInDeps {
if isBinary {
wholeStaticLibs = append(wholeStaticLibs, versionLib)
} else {
la.implementationWholeArchiveDeps.SetSelectValue(axis, config, bazelLabelForWholeDepsExcludes(ctx, []string{versionLib}, props.Exclude_static_libs))
}
}
}
}