commit 966c1e0cae6a59f15264d3b542af08e21e2dc06c
author Ying Wang <wangying@google.com> Tue May 20 14:43:51 2014 -0700
committer Ying Wang <wangying@google.com> Tue May 20 18:03:21 2014 -0700
tree fc310007c15dd5de89d3fc7b3fe8eb6212039076
parent 4e151105a02ba09acb277c6a084252d01c561a5f

Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build

We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.

Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index fa8e872..b07d5a1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -647,6 +647,14 @@
       $(subst $(comma),$(space),$(lastword $(p))))))) \
   $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))
 endif
+ifdef HOST_2ND_ARCH
+$(foreach m,$($(HOST_2ND_ARCH_VAR_PREFIX)HOST_DEPENDENCIES_ON_SHARED_LIBRARIES), \
+  $(eval p := $(subst :,$(space),$(m))) \
+  $(eval r := $(filter $(HOST_OUT_ROOT)/%,$(call module-installed-files,\
+    $(addsuffix $(HOST_2ND_ARCH_MODULE_SUFFIX), \
+      $(subst $(comma),$(space),$(lastword $(p))))))) \
+  $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))
+endif
 
 m :=
 r :=