Resolve :32 to 32-bit variant only if the variant exists.
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.
Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
diff --git a/core/main.mk b/core/main.mk
index 9f341b9..c65fe3c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -690,7 +690,9 @@
modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES)))
modules_64 := $(patsubst %:64,%,$(filter %:64, $(product_MODULES)))
modules_rest := $(filter-out %:32 %:64,$(product_MODULES))
- product_MODULES := $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX),$(modules_32))
+ # Note for 32-bit product, $(modules_32) and $(modules_64) will be
+ # added as their original module names.
+ product_MODULES := $(call get-32-bit-modules-if-we-can, $(modules_32))
product_MODULES += $(modules_64)
# For the rest we add both
product_MODULES += $(call get-32-bit-modules, $(modules_rest))