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

mixed builds correctly reference stubs libs

Browse Source 
Bug: 270408757
Test: go test
Test: m NeuralNetworksTest_shared_partial --bazel-mode-staging
  && verify that Ninja commands link libneuralnetworks via stubs
Change-Id: I19bf5a829cea7fd00c0f82511ad2bddbc40fae4f
This commit is contained in:
Sam Delmerico
2023-04-10 17:19:51 -04:00
parent 2a1de1bfe6
commit ca438e6b72
6 changed files with 201 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bazel/cquery/request_type.go
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: