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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
bp2build/cc_library_conversion_test.go
View File

@@ -153,10 +153,10 @@ cc_library {
"//build/bazel/platforms/os:linux_glibc": ["linux.cpp"], "//build/bazel/platforms/os:linux_glibc": ["linux.cpp"],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"sdk_version": `"current"`, "sdk_version": `"current"`,
"min_sdk_version": `"29"`, "min_sdk_version": `"29"`,
"use_version_lib": `True`, "use_version_lib": `True`,
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`, "whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
}), }),
}) })
} }

4
bp2build/cc_library_shared_conversion_test.go
View File

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

2
bp2build/cc_library_static_conversion_test.go
View File

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

6
cc/bp2build.go
View File

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