diff options
| author | Usta (Tsering) Shrestha <usta@google.com> | 2023-04-19 14:02:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-04-19 14:02:52 +0000 |
| commit | 1db4348734acfd0b4a38e2ff49dca2df4bac0d84 (patch) | |
| tree | 25ef8e5aad99037053965605c4bb86dc486c7d32 /bazel | |
| parent | ca438e6b72aba8306da500b9426acad1aa767b53 (diff) | |
Revert "mixed builds correctly reference stubs libs"
This reverts commit ca438e6b72aba8306da500b9426acad1aa767b53.
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
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/cquery/request_type.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bazel/cquery/request_type.go b/bazel/cquery/request_type.go index 6a3b3c82c..bf3a6b5c6 100644 --- a/bazel/cquery/request_type.go +++ b/bazel/cquery/request_type.go @@ -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: |