Revert "Switch to llvm-ar"
This reverts commit 5128702ed3ee97f1415315e69d2663539fc6a132.
Bug: 71694982
Reason for revert: Broke Mac build
Change-Id: I1044eccf943bae3c99e7527bd13989c70743b3d4
diff --git a/core/aux_config.mk b/core/aux_config.mk
index 41c14ae..c40b8cc 100644
--- a/core/aux_config.mk
+++ b/core/aux_config.mk
@@ -32,7 +32,7 @@
# 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 94e37c6..5e181b9 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -28,7 +28,7 @@
# 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