commit 940d68af5324d3241a65301e31cb12900b49ac96
author Ying Wang <wangying@google.com> Thu Feb 13 15:56:34 2014 -0800
committer Ying Wang <wangying@google.com> Thu Feb 13 15:56:34 2014 -0800
tree affee49ed650b949181cd7ad544cdb841b2e8785
parent 7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f

Don't check the existence for the 64-bit modules for 32-bit SDK build.

Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc

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