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

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

Browse Source
This commit is contained in:
Yu Liu
2023-05-02 17:34:02 +00:00
committed by Gerrit Code Review
parent 2bedceeb53 fe978fd2c1
commit bd421e06d1
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"],
"//conditions:default": [],
})`,
"sdk_version": `"current"`,
"min_sdk_version": `"29"`,
"use_version_lib": `True`,
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
"sdk_version": `"current"`,
"min_sdk_version": `"29"`,
"use_version_lib": `True`,
"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{
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
"use_version_lib": "True",
"implementation_whole_archive_deps": `["//build/soong/cc/libbuildversion:libbuildversion"]`,
"use_version_lib": "True",
"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{
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

@@ -1053,11 +1053,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))
}
wholeStaticLibs = append(wholeStaticLibs, versionLib)
}
}
}