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

Revert "mixed builds correctly reference stubs libs"

Browse Source 
This reverts commit ca438e6b72.

Reason for revert: ci post-submit failures in aosp-master-bazel of targets mixed-droid-clean and mixed-droid-incremental:
FAILED: ninja: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libc_intermediates/libc.so.toc', needed by 'out/target/product/generic_arm64/obj/EXECUTABLES/updater_intermediates/LINKED/updater', missing and no known rule to make it
12:21:27 ninja failed with: exit status 1

Change-Id: I081b499d23f2568cdf6227c4e3b0278164086b69
This commit is contained in:
Usta (Tsering) Shrestha
2023-04-19 14:02:52 +00:00
committed by Gerrit Code Review
parent ca438e6b72
commit 1db4348734
6 changed files with 13 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bazel/cquery/request_type.go
View File

@@ -149,7 +149,6 @@ 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 = ""
@@ -161,8 +160,6 @@ 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: