commit 2fbe5018f94f536541c0137be472e58c79890813
author Colin Cross <ccross@android.com> Fri Feb 14 00:24:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 00:24:47 2014 +0000
tree 21e6d84339a3d8a39f8c6c5e44f14f4dc8a79e6c
parent 3bbaab31069045aea9ae33c1d995640e56182a82
parent 381435353d160301bda40a533f782371109047cb

Merge "add linker64 and debuggerd64 to all products"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index ee22a91..d568f8a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -759,6 +759,10 @@
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
       $(eval dangling_modules += $(m))))
+  ifneq ($(TARGET_IS_64_BIT),true)
+    # We know those 64-bit modules don't exist in the 32-bit SDK build.
+    dangling_modules := $(filter-out %64,$(dangling_modules))
+  endif
   ifneq ($(dangling_modules),)
     $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)
   endif