From 4f2e0334474788b20d464f1cdbacf421fb0548f8 Mon Sep 17 00:00:00 2001
From: Yi Kong <yikong@google.com>
Date: Mon, 8 Jan 2018 18:09:54 +0000
Subject: [PATCH] Revert "Switch to llvm-ar"

This reverts commit 5128702ed3ee97f1415315e69d2663539fc6a132.

Bug: 71694982
Reason for revert: Broke Mac build

Change-Id: I1044eccf943bae3c99e7527bd13989c70743b3d4
---
 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 41c14aef4..c40b8cc7a 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 := cqsD
+AUX_GLOBAL_ARFLAGS := crsPD
 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 94e37c652..5e181b9d8 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 := cqsD
+$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
 
 $(combo_var_prefix)STATIC_LIB_SUFFIX := .a