aboutsummaryrefslogtreecommitdiffstats
path: root/core/multilib.mk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-04-10 11:28:04 -0700
committerColin Cross <ccross@android.com>2014-04-10 15:49:38 -0700
commitdc1c95aa2096367b78512025e59c50ebe99bc263 (patch)
treed966287da284eecde43d66640b258cd93aff51e6 /core/multilib.mk
parentd3624d5f4850e4cb0676f4a9897fe77524403b8c (diff)
downloadbuild_make-dc1c95aa2096367b78512025e59c50ebe99bc263.tar.gz
build_make-dc1c95aa2096367b78512025e59c50ebe99bc263.tar.bz2
build_make-dc1c95aa2096367b78512025e59c50ebe99bc263.zip
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/multilib.mk')
-rw-r--r--core/multilib.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/multilib.mk b/core/multilib.mk
index fa5397a773..83802492e0 100644
--- a/core/multilib.mk
+++ b/core/multilib.mk
@@ -20,7 +20,7 @@ else ifeq ($(LOCAL_NO_2ND_ARCH),true)
my_module_multilib := first
endif
else # my_module_multilib defined
-ifeq (,$(filter 32 first both none,$(my_module_multilib)))
+ifeq (,$(filter 32 64 first both none,$(my_module_multilib)))
$(error $(LOCAL_PATH): Invalid LOCAL_MULTILIB specified for module $(LOCAL_MODULE))
endif
endif # my_module_multilib defined