Revert "Revert "mixed builds correctly reference stubs libs""

This reverts commit 1db4348734.

Changes from original:
  - extracted function to add the current version to stub
    versions for bp2build.
  - added libc++ to mixed builds denylist

Reason for revert: re-uploading with fix in topic

Change-Id: Ifa0ed456bf8cb4a7f861d6826263adfedb4fdd9c
This commit is contained in:
Sam Delmerico
2023-04-20 13:13:25 +00:00
committed by Spandan Das
parent 28cbb75a09
commit 75dbca2eae
6 changed files with 235 additions and 15 deletions

View File

@@ -149,6 +149,7 @@ sharedLibraries = []
rootSharedLibraries = []
shared_info_tag = "//build/bazel/rules/cc:cc_library_shared.bzl%CcSharedLibraryOutputInfo"
stubs_tag = "//build/bazel/rules/cc:cc_stub_library.bzl%CcStubInfo"
unstripped_tag = "//build/bazel/rules/cc:stripped_cc_common.bzl%CcUnstrippedInfo"
unstripped = ""
@@ -160,6 +161,8 @@ if shared_info_tag in p:
unstripped = path
if unstripped_tag in p:
unstripped = p[unstripped_tag].unstripped.path
elif stubs_tag in p:
rootSharedLibraries.extend([f.path for f in target.files.to_list()])
else:
for linker_input in linker_inputs:
for library in linker_input.libraries: