commit e1b96f3ae5e6aed925fa94bda21d24ccd1d131c8
author Evgenii Stepanov <eugenis@google.com> Mon Jan 23 16:57:38 2017 -0800
committer Evgenii Stepanov <eugenis@google.com> Mon Jan 23 17:02:22 2017 -0800
tree 13cf0be1395c201a2fe591e1b0f57d96642b50df
parent 2d7fb30207f1c78f867bda6d21e24a5448181d41

Run $(AR) with LLVMgold.so plugin for CFI targets.

Bug: 34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index c9883d4..1046ff6 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -145,6 +145,7 @@
 ifneq ($(filter cfi,$(my_sanitize)),)
   my_cflags += -flto -fsanitize-cfi-cross-dso -fvisibility=default
   my_ldflags += -flto -fsanitize-cfi-cross-dso -fsanitize=cfi -Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check
+  my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
 endif
 
 # If local or global modules need ASAN, add linker flags.