StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."

Browse Source 
* commit 'b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
  Resolve :32 to 32-bit variant only if the variant exists.
This commit is contained in:
Ying Wang
2014-06-24 18:17:52 +00:00
committed by Android Git Automerger
parent 57befc90e9 b00bb2d865
commit 5899ad254d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -690,7 +690,9 @@ ifdef FULL_BUILD
modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES))) modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES)))
modules_64 := $(patsubst %:64,%,$(filter %:64, $(product_MODULES))) modules_64 := $(patsubst %:64,%,$(filter %:64, $(product_MODULES)))
modules_rest := $(filter-out %:32 %: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) product_MODULES += $(modules_64)
# For the rest we add both # For the rest we add both
product_MODULES += $(call get-32-bit-modules, $(modules_rest)) product_MODULES += $(call get-32-bit-modules, $(modules_rest))