commit 2a94e9dcc2794272829602a515a5ee66c92255f9
author Dan Willemsen <dwillemsen@google.com> Thu Apr 20 21:22:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 21:22:46 2017 +0000
tree 5cc551554616ec245d716e6ec664579528ec04f2
parent 26a07ecdc7d28a67a78a1009474cb99e99db966e
parent 26f8ac9a42597cde949bfef9286088f311ee47db

Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds" am: 2f9b9f0938 am: 8156e82fa7
am: 26f8ac9a42

Change-Id: Ibb851a9fa1794e60354957c14ed3e95abcd968e5

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 4fe058d..f3713fc 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -4,13 +4,15 @@
 
 $(call record-module-type,PACKAGE)
 
-ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
-LOCAL_MULTILIB := first
-endif
-
 my_prefix := TARGET_
 include $(BUILD_SYSTEM)/multilib.mk
 
+ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
+  ifneq ($(TARGET_SUPPORTS_64_BIT_APPS)|$(my_module_multilib),|64)
+    my_module_multilib := first
+  endif
+endif
+
 ifeq ($(TARGET_SUPPORTS_32_BIT_APPS)|$(TARGET_SUPPORTS_64_BIT_APPS),true|true)
   # packages default to building for either architecture,
   # the preferred if its supported, otherwise the non-preferred.