diff options
| -rw-r--r-- | core/clear_vars.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 64aabda757..d05d663e3d 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -133,7 +133,7 @@ LOCAL_PRIVILEGED_MODULE:= LOCAL_MODULE_OWNER:= LOCAL_CTS_TEST_PACKAGE:= LOCAL_CTS_TEST_RUNNER:= -LOCAL_CLANG:= +LOCAL_CLANG:=$(GLOBAL_CLANG) LOCAL_ADDRESS_SANITIZER:= LOCAL_JAR_EXCLUDE_FILES:= LOCAL_JAR_PACKAGES:= @@ -177,7 +177,7 @@ LOCAL_STATIC_LIBRARIES_$(TARGET_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_ARCH):= LOCAL_GENERATED_SOURCES_$(TARGET_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):= -LOCAL_CLANG_$(TARGET_ARCH):= +LOCAL_CLANG_$(TARGET_ARCH):=$(GLOBAL_CLANG_$(TARGET_ARCH)) LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):= ifdef TARGET_2ND_ARCH LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):= @@ -196,7 +196,7 @@ LOCAL_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_2ND_ARCH):= LOCAL_GENERATED_SOURCES_$(TARGET_2ND_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):= -LOCAL_CLANG_$(TARGET_2ND_ARCH):= +LOCAL_CLANG_$(TARGET_2ND_ARCH):=$(GLOBAL_CLANG_$(TARGET_2ND_ARCH)) LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):= endif LOCAL_SRC_FILES_$(HOST_ARCH):= @@ -215,7 +215,7 @@ LOCAL_STATIC_LIBRARIES_$(HOST_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(HOST_ARCH):= LOCAL_GENERATED_SOURCES_$(HOST_ARCH):= LOCAL_REQUIRED_MODULES_$(HOST_ARCH):= -LOCAL_CLANG_$(HOST_ARCH):= +LOCAL_CLANG_$(HOST_ARCH):=$(GLOBAL_CLANG_$(HOST_ARCH)) ifdef HOST_2ND_ARCH LOCAL_SRC_FILES_$(HOST_2ND_ARCH):= LOCAL_CFLAGS_$(HOST_2ND_ARCH):= @@ -233,7 +233,7 @@ LOCAL_STATIC_LIBRARIES_$(HOST_2ND_ARCH):= LOCAL_WHOLE_STATIC_LIBRARIES_$(HOST_2ND_ARCH):= LOCAL_GENERATED_SOURCES_$(HOST_2ND_ARCH):= LOCAL_REQUIRED_MODULES_$(HOST_2ND_ARCH):= -LOCAL_CLANG_$(HOST_2ND_ARCH):= +LOCAL_CLANG_$(HOST_2ND_ARCH):=$(GLOBAL_CLANG_$(HOST_2ND_ARCH)) endif LOCAL_SRC_FILES_32:= @@ -268,8 +268,8 @@ LOCAL_MODULE_PATH_32:= LOCAL_MODULE_PATH_64:= LOCAL_MODULE_STEM_32:= LOCAL_MODULE_STEM_64:= -LOCAL_CLANG_32:= -LOCAL_CLANG_64:= +LOCAL_CLANG_32:=$(GLOBAL_CLANG_32) +LOCAL_CLANG_64:=$(GLOBAL_CLANG_64) # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. |