diff options
| author | Colin Cross <ccross@android.com> | 2014-04-11 16:00:23 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-04-11 16:57:36 -0700 |
| commit | 149d65b177c4c49ed7c025e11d4ad3d7bca574ac (patch) | |
| tree | 5fabf1bd56e47f7b7286bc3029c82dd97ad7edac | |
| parent | f702d6d1d534c914bc0127937eb1a1df61c60762 (diff) | |
| download | build-149d65b177c4c49ed7c025e11d4ad3d7bca574ac.zip build-149d65b177c4c49ed7c025e11d4ad3d7bca574ac.tar.gz build-149d65b177c4c49ed7c025e11d4ad3d7bca574ac.tar.bz2 | |
build: remove LOCAL_NO_2ND_ARCH
Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent
functionality is available with LOCAL_MULTILIB := first.
Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/multilib.mk | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index ed692b9..ea47003 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -143,7 +143,6 @@ LOCAL_HAL_STATIC_LIBRARIES:= LOCAL_NO_SYNTAX_CHECK:= LOCAL_NO_STATIC_ANALYZER:= LOCAL_32_BIT_ONLY:= # '',true -LOCAL_NO_2ND_ARCH:= # '',true LOCAL_MODULE_TARGET_ARCH:= LOCAL_MODULE_TARGET_ARCH_WARN:= LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:= diff --git a/core/multilib.mk b/core/multilib.mk index 8380249..f630c94 100644 --- a/core/multilib.mk +++ b/core/multilib.mk @@ -3,21 +3,10 @@ # setting in my_module_multilib, or empty if not set. my_module_multilib := $(strip $(LOCAL_MULTILIB)) + ifndef my_module_multilib -ifeq ($(LOCAL_32_BIT_ONLY)|$(LOCAL_NO_2ND_ARCH),true|true) -ifdef TARGET_2ND_ARCH -# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 64-bit target -# skip the module completely -my_module_multilib := none -else -# Both LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH specified on 32-bit target -# build for 32-bit -my_module_multilib := 32 -endif -else ifeq ($(LOCAL_32_BIT_ONLY),true) +ifeq ($(LOCAL_32_BIT_ONLY),true) my_module_multilib := 32 -else ifeq ($(LOCAL_NO_2ND_ARCH),true) -my_module_multilib := first endif else # my_module_multilib defined ifeq (,$(filter 32 64 first both none,$(my_module_multilib))) |