Merge "Remove dangling reference to LLVMgold.so" into main am: 7859cc45f7

Original change: https://android-review.googlesource.com/c/platform/build/+/2665360

Change-Id: I36f43b3cf4dfec31128d3ba2093d96250551151e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong
2023-07-20 17:41:59 +00:00
committed by Automerger Merge Worker

View File

@@ -413,7 +413,6 @@ ifneq ($(filter cfi,$(my_sanitize)),)
my_cflags += -fvisibility=default
endif
my_ldflags += $(CFI_EXTRA_LDFLAGS)
my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags))