diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 02:25:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:20:24 +0000 |
| commit | cc2a47bf64b87f228b10c8f83b1575eee2aa1e76 (patch) | |
| tree | ebdc1b90298f7ee2a44ef0feac16b3525218b5b4 | |
| parent | b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c (diff) | |
| parent | ff3a9045229b0613552e45de2a31a7ac8debb597 (diff) | |
| download | build-cc2a47bf64b87f228b10c8f83b1575eee2aa1e76.tar.gz | |
Merge "Check existence of both 64-bit and 32-bit module variants."
| -rw-r--r-- | core/main.mk | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/core/main.mk b/core/main.mk index 98b76ee5c1..15b4cbcb35 100644 --- a/core/main.mk +++ b/core/main.mk @@ -569,7 +569,6 @@ CUSTOM_MODULES := \ # brought in as requirements of other modules. # # Resolve the required module name to 32-bit or 64-bit variant. -ifeq ($(TARGET_IS_64_BIT),true) # Get a list of corresponding 32-bit module names, if one exists. define get-32-bit-modules $(strip $(foreach m,$(1),\ @@ -599,12 +598,10 @@ $(foreach m,$(ALL_MODULES),\ $(eval r_r := $(r) $(call get-32-bit-modules,$(r)))\ )\ )\ - $(eval ALL_MODULES.$(m).REQUIRED := $(r_r))\ + $(eval ALL_MODULES.$(m).REQUIRED := $(strip $(r_r)))\ )\ ) r_r := -endif - define add-required-deps $(1): | $(2) @@ -695,15 +692,11 @@ ifdef FULL_BUILD modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES))) modules_64 := $(patsubst %:64,%,$(filter %:64, $(product_MODULES))) modules_rest := $(filter-out %:32 %:64,$(product_MODULES)) - ifeq ($(TARGET_IS_64_BIT),true) - product_MODULES := $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX),$(modules_32)) - product_MODULES += $(modules_64) - # For the rest we add both - product_MODULES += $(call get-32-bit-modules, $(modules_rest)) - product_MODULES += $(modules_rest) - else - product_MODULES := $(modules_32) $(modules_64) $(modules_rest) - endif + product_MODULES := $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX),$(modules_32)) + product_MODULES += $(modules_64) + # For the rest we add both + product_MODULES += $(call get-32-bit-modules, $(modules_rest)) + product_MODULES += $(modules_rest) $(call expand-required-modules,product_MODULES,$(product_MODULES)) @@ -773,7 +766,7 @@ ifdef is_sdk_build # TODO: Should we do this for all builds and not just the sdk? dangling_modules := $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ - $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ + $(if $(strip $(ALL_MODULES.$(m).INSTALLED) $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).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. |