openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants." 

* commit '6b468193536c1925944ccbf6269ee057e080aef4':
  Check existence of both 64-bit and 32-bit module variants.
This commit is contained in:
Ying Wang 2014-06-11 02:29:37 +00:00 committed by Android Git Automerger
parent 4706eb3f22 6b46819353
commit 2ebf7c1c5f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/main.mk
View File

@ -569,7 +569,6 @@ CUSTOM_MODULES := \
# brought in as requirements of other modules. # brought in as requirements of other modules.
# #
# Resolve the required module name to 32-bit or 64-bit variant. # 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. # Get a list of corresponding 32-bit module names, if one exists.
define get-32-bit-modules define get-32-bit-modules
$(strip $(foreach m,$(1),\ $(strip $(foreach m,$(1),\
@ -599,12 +598,10 @@ $(foreach m,$(ALL_MODULES),\
$(eval r_r := $(r) $(call get-32-bit-modules,$(r)))\ $(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 := r_r :=
endif
define add-required-deps define add-required-deps
$(1): | $(2) $(1): | $(2)
@ -695,15 +692,11 @@ 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))
ifeq ($(TARGET_IS_64_BIT),true) product_MODULES := $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX),$(modules_32))
product_MODULES := $(addsuffix $(TARGET_2ND_ARCH_MODULE_SUFFIX),$(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)) product_MODULES += $(modules_rest)
product_MODULES += $(modules_rest)
else
product_MODULES := $(modules_32) $(modules_64) $(modules_rest)
endif
$(call expand-required-modules,product_MODULES,$(product_MODULES)) $(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? # TODO: Should we do this for all builds and not just the sdk?
dangling_modules := dangling_modules :=
$(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(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)))) $(eval dangling_modules += $(m))))
ifneq ($(TARGET_IS_64_BIT),true) ifneq ($(TARGET_IS_64_BIT),true)
# We know those 64-bit modules don't exist in the 32-bit SDK build. # We know those 64-bit modules don't exist in the 32-bit SDK build.