Merge "Switch back to llvm-ar." am: 38228f2156

am: 822bc8fedb

Change-Id: I980bb3416da0c4b46fd59e28e6b3bd98cd568285
This commit is contained in:
Stephen Hines 2018-01-11 07:51:44 +00:00 committed by android-build-merger
commit b93c68d7a0
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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