bp2build: reference static variants directly
Previously, when referencing a cc_library as a static_lib from a converted module, the corresponding target would depend on the "root target" of that cc_library. This resulted in a superfluous dependency on the shared target of the cc_library dependency. This superfluous dependency could sometimes result in cycles. This change ensures the static target name is directly specified in such cases. Test: mixed_libc.sh CI Test: USE_BAZEL_ANALYSIS=1 m fmtlib Change-Id: I36ee9f0a9017b1e9d73df9e3174669107f0afd4f
This commit is contained in:
@@ -275,7 +275,7 @@ func CcLibraryBp2Build(ctx android.TopDownMutatorContext) {
|
||||
// For some cc_library modules, their static variants are ready to be
|
||||
// converted, but not their shared variants. For these modules, delegate to
|
||||
// the cc_library_static bp2build converter temporarily instead.
|
||||
if android.GenerateCcLibraryStaticOnly(ctx) {
|
||||
if android.GenerateCcLibraryStaticOnly(ctx.Module().Name()) {
|
||||
ccSharedOrStaticBp2BuildMutatorInternal(ctx, m, "cc_library_static")
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user