Merge "Move go default system properties into prop files"
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index aeead06..e2ac03c 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -12,10 +12,12 @@
my_global_sanitize_diag :=
ifeq ($(my_clang),true)
ifdef LOCAL_IS_HOST_MODULE
- my_global_sanitize := $(strip $(SANITIZE_HOST))
+ ifneq ($(HOST_CROSS_OS),windows)
+ my_global_sanitize := $(strip $(SANITIZE_HOST))
- # SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
- my_global_sanitize := $(subst true,address,$(my_global_sanitize))
+ # SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.
+ my_global_sanitize := $(subst true,address,$(my_global_sanitize))
+ endif
else
my_global_sanitize := $(strip $(SANITIZE_TARGET))
my_global_sanitize_diag := $(strip $(SANITIZE_TARGET_DIAG))
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index f82af2f..c635ca5 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -9,13 +9,13 @@
include $(BUILD_SYSTEM)/use_lld_setup.mk
ifneq ($(LOCAL_PREBUILT_LIBS),)
-$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH))
+$(call pretty-error,dont use LOCAL_PREBUILT_LIBS anymore)
endif
ifneq ($(LOCAL_PREBUILT_EXECUTABLES),)
-$(error dont use LOCAL_PREBUILT_EXECUTABLES anymore LOCAL_PATH=$(LOCAL_PATH))
+$(call pretty-error,dont use LOCAL_PREBUILT_EXECUTABLES anymore)
endif
ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)
-$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))
+$(call pretty-error,dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore)
endif
my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)
@@ -125,13 +125,13 @@
ifneq ($(filter true keep_symbols no_debuglink mini-debug-info,$(my_strip_module)),)
ifdef LOCAL_IS_HOST_MODULE
- $(error Cannot strip/pack host module LOCAL_PATH=$(LOCAL_PATH))
+ $(call pretty-error,Cannot strip/pack host module)
endif
ifeq ($(filter SHARED_LIBRARIES EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
- $(error Can strip/pack only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH))
+ $(call pretty-error,Can strip/pack only shared libraries or executables)
endif
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
- $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH))
+ $(call pretty-error,Cannot strip/pack scripts)
endif
# Set the arch-specific variables to set up the strip rules
LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_strip_module)
diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index d00a5d3..b0386d5 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -18,10 +18,14 @@
endif
endif
-# Do not use LLD for Darwin host executables or shared libraries.
-# See https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.
ifeq ($(LOCAL_IS_HOST_MODULE),true)
+ # Do not use LLD for Darwin host executables or shared libraries. See
+ # https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.
ifeq ($(HOST_OS),darwin)
my_use_clang_lld := false
endif
+ # http://b/110800681 - lld cannot link Android's Windows modules yet.
+ ifeq ($(HOST_CROSS_OS),windows)
+ my_use_clang_lld := false
+ endif
endif