libbuildversion should be linked as a whole archive dep as soong does.
Bug: 278789968
Test: Unit tests and CI
Change-Id: Ic2c44826bdc03b91cc19d93f96096ec6fdf44833
diff --git a/cc/bp2build.go b/cc/bp2build.go
index c8f516c..9f5da6b 100644
--- a/cc/bp2build.go
+++ b/cc/bp2build.go
@@ -1036,11 +1036,7 @@
_, 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))
- }
+ wholeStaticLibs = append(wholeStaticLibs, versionLib)
}
}
}