From dc1c95aa2096367b78512025e59c50ebe99bc263 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 10 Apr 2014 11:28:04 -0700
Subject: [PATCH] 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
---
 core/module_arch_supported.mk | 4 ++++
 core/multilib.mk              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/module_arch_supported.mk b/core/module_arch_supported.mk
index 1e03914838..753a29ec42 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
 
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