diff options
| author | Ying Wang <wangying@google.com> | 2014-05-27 13:03:36 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-27 13:06:08 -0700 |
| commit | 824344af004bc87a7b7a301e53814258c8412e4f (patch) | |
| tree | 8e27bd51e3216749f23de8b117c19cd20f1ab9c0 /core/clear_vars.mk | |
| parent | 3805f619156163eab8ad92fd51b4a431be1287bd (diff) | |
| download | build-824344af004bc87a7b7a301e53814258c8412e4f.zip build-824344af004bc87a7b7a301e53814258c8412e4f.tar.gz build-824344af004bc87a7b7a301e53814258c8412e4f.tar.bz2 | |
Support LOCAL_CLANG with arch/bit suffix.
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.
Bug: 15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
Diffstat (limited to 'core/clear_vars.mk')
| -rw-r--r-- | core/clear_vars.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index be1def1..801b0fa 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -145,6 +145,7 @@ LOCAL_HAL_STATIC_LIBRARIES:= LOCAL_NO_SYNTAX_CHECK:= LOCAL_NO_STATIC_ANALYZER:= LOCAL_32_BIT_ONLY:= # '',true +LOCAL_MULTILIB:= LOCAL_MODULE_TARGET_ARCH:= LOCAL_MODULE_TARGET_ARCH_WARN:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:= @@ -167,6 +168,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):= ifdef TARGET_2ND_ARCH LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):= LOCAL_CFLAGS_$(TARGET_2ND_ARCH):= @@ -180,6 +182,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):= endif LOCAL_SRC_FILES_$(HOST_ARCH):= LOCAL_CFLAGS_$(HOST_ARCH):= @@ -193,6 +196,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):= ifdef HOST_2ND_ARCH LOCAL_SRC_FILES_$(HOST_2ND_ARCH):= LOCAL_CFLAGS_$(HOST_2ND_ARCH):= @@ -206,6 +210,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):= endif LOCAL_SRC_FILES_32:= @@ -232,7 +237,8 @@ LOCAL_MODULE_PATH_32:= LOCAL_MODULE_PATH_64:= LOCAL_MODULE_STEM_32:= LOCAL_MODULE_STEM_64:= -LOCAL_MULTILIB:= +LOCAL_CLANG_32:= +LOCAL_CLANG_64:= # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. |