am 3f054bdd: am 506857e9: Merge "Make linker configurable through environment."
* commit '3f054bdd0d8201c6ebc7f5037a3af685d8eb8062': Make linker configurable through environment.
This commit is contained in:
commit
9be13a763c
|
@ -230,7 +230,11 @@ $(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \
|
||||||
b_lib :=
|
b_lib :=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LINKER)
|
ifneq ($(strip $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)),)
|
||||||
|
my_linker := $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)
|
||||||
|
else
|
||||||
|
my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LINKER)
|
||||||
|
endif
|
||||||
|
|
||||||
include $(BUILD_SYSTEM)/config_sanitizers.mk
|
include $(BUILD_SYSTEM)/config_sanitizers.mk
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue