diff options
| author | Colin Cross <ccross@android.com> | 2014-04-10 11:28:04 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-04-10 15:49:38 -0700 |
| commit | dc1c95aa2096367b78512025e59c50ebe99bc263 (patch) | |
| tree | d966287da284eecde43d66640b258cd93aff51e6 /core/module_arch_supported.mk | |
| parent | d3624d5f4850e4cb0676f4a9897fe77524403b8c (diff) | |
| download | build-dc1c95aa2096367b78512025e59c50ebe99bc263.zip build-dc1c95aa2096367b78512025e59c50ebe99bc263.tar.gz build-dc1c95aa2096367b78512025e59c50ebe99bc263.tar.bz2 | |
build: add support for LOCAL_MULTILIB := 64
I don't expect it to be useful for modules, but package.mk will
use it to only install 64-bit native apps on devices that
only have a 64-bit zygote.
Change-Id: If3f5a81c3a60bd13fa6ded08e2a7579a29877324
Diffstat (limited to 'core/module_arch_supported.mk')
| -rw-r--r-- | core/module_arch_supported.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/module_arch_supported.mk b/core/module_arch_supported.mk index 1e03914..753a29e 100644 --- a/core/module_arch_supported.mk +++ b/core/module_arch_supported.mk @@ -25,12 +25,16 @@ endif ifeq ($(LOCAL_2ND_ARCH_VAR_PREFIX),) ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),true|32) my_module_arch_supported := false +else ifeq ($(TARGET_IS_64_BIT)|$(my_module_multilib),|64) +my_module_arch_supported := false else ifeq ($(call directory_is_64_bit_blacklisted,$(LOCAL_PATH)),true) my_module_arch_supported := false endif else # LOCAL_2ND_ARCH_VAR_PREFIX ifeq ($(my_module_multilib),first) my_module_arch_supported := false +else ifeq ($(my_module_multilib),64) +my_module_arch_supported := false endif endif # LOCAL_2ND_ARCH_VAR_PREFIX |