Merge "Revert "Switch to llvm-ar"" am: 259b2741bb

am: 87f90c1151

Change-Id: Ic7b843bbf519b90f91144e9c306e926da6840ef1
This commit is contained in:
Yi Kong 2018-01-08 20:42:17 +00:00 committed by android-build-merger
commit d36f66fc17
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 := 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

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 := cqsD
$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
$(combo_var_prefix)STATIC_LIB_SUFFIX := .a