From d612b8329af6c7aefb7a619de4d7e4f6c8c66863 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 9 Jan 2018 23:28:30 -0800 Subject: [PATCH] Switch back to llvm-ar. This properly sets -format=gnu for all non-Darwin targets, because llvm-ar is cross-platform (but defaults to the host environment). Bug: http://b/71618641 Test: m checkbuild Change-Id: Ib5d1c112a4ac792a11d1a0721ae6b0a5f9a42727 --- core/aux_config.mk | 2 +- core/combo/select.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/aux_config.mk b/core/aux_config.mk index c40b8cc7a..41c14aef4 100644 --- a/core/aux_config.mk +++ b/core/aux_config.mk @@ -32,7 +32,7 @@ endif # setup AUX globals AUX_SHLIB_SUFFIX := .so -AUX_GLOBAL_ARFLAGS := crsPD +AUX_GLOBAL_ARFLAGS := cqsD AUX_STATIC_LIB_SUFFIX := .a # Load ever-lasting "indexed" version of AUX variant environment; it is treated as READ-ONLY from this diff --git a/core/combo/select.mk b/core/combo/select.mk index 5e181b9d8..eab4c7288 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -28,7 +28,7 @@ combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target) # Set reasonable defaults for the various variables -$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD +$(combo_var_prefix)GLOBAL_ARFLAGS := cqsD -format=gnu $(combo_var_prefix)STATIC_LIB_SUFFIX := .a