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/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index dd53e7e..d77cea9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1581,6 +1581,7 @@
 $(extract-and-include-target-whole-static-libs)
 $(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \
     $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
+    $(PRIVATE_ARFLAGS) \
     $@,$(PRIVATE_ALL_OBJECTS))
 endef