Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87f90c11 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Revert "Switch to llvm-ar"" 

am: 259b2741

Change-Id: I3ad87b11c408d4c6bfd6475c6e73256783d88f55
parents 05d63dc7 259b2741

core/aux_config.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ endif 




# setup AUX globals

# setup AUX globals

AUX_SHLIB_SUFFIX := .so

AUX_SHLIB_SUFFIX := .so

AUX_GLOBAL_ARFLAGS := cqsD

AUX_GLOBAL_ARFLAGS := crsPD

AUX_STATIC_LIB_SUFFIX := .a

AUX_STATIC_LIB_SUFFIX := .a





# Load ever-lasting "indexed" version of AUX variant environment; it is treated as READ-ONLY from this

# Load ever-lasting "indexed" version of AUX variant environment; it is treated as READ-ONLY from this

core/combo/select.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target) 




# Set reasonable defaults for the various variables

# 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

$(combo_var_prefix)STATIC_LIB_SUFFIX := .a