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

Merge "Skip the platform availability check for unbundled builds."

This commit is contained in:
Martin Stjernholm 2020-11-18 16:24:39 +00:00 committed by Gerrit Code Review
parent 4193982580 8878beb615
commit 7a3a2e97ad
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/tasks/platform_availability_check.mk
View File

@ -17,6 +17,9 @@
# Check whether there is any module that isn't available for platform # Check whether there is any module that isn't available for platform
# is installed to the platform. # is installed to the platform.
# Skip for unbundled builds that don't produce a platform image.
ifeq (,$(TARGET_BUILD_UNBUNDLED))
# Filter FAKE and NON_INSTALLABLE modules out and then collect those are not # Filter FAKE and NON_INSTALLABLE modules out and then collect those are not
# available for platform # available for platform
_modules_not_available_for_platform := \ _modules_not_available_for_platform := \
@ -41,7 +44,7 @@ else
# Don't error out immediately when ALLOW_MISSING_DEPENDENCIES is set. # Don't error out immediately when ALLOW_MISSING_DEPENDENCIES is set.
# Instead, add a dependency on a rule that prints the error message. # Instead, add a dependency on a rule that prints the error message.
define not_available_for_platform_rule define not_available_for_platform_rule
not_installable_file := $(patsubst $(OUT_DIR)/%,$(OUT_DIR)/NOT_AVAILABLE_FOR_PLATFORM/%,$(1))) not_installable_file := $(patsubst $(OUT_DIR)/%,$(OUT_DIR)/NOT_AVAILABLE_FOR_PLATFORM/%,$(1))
$(1): $$(not_installable_file) $(1): $$(not_installable_file)
$$(not_installable_file): $$(not_installable_file):
$(call echo-error,$(2),Module is requested to be installed but is not \ $(call echo-error,$(2),Module is requested to be installed but is not \
@ -54,3 +57,5 @@ it depends on other modules that are not available for platform.)
$(foreach i,$(filter-out $(HOST_OUT)/%,$(ALL_MODULES.$(m).INSTALLED)),\ $(foreach i,$(filter-out $(HOST_OUT)/%,$(ALL_MODULES.$(m).INSTALLED)),\
$(eval $(call not_available_for_platform_rule,$(i),$(m))))) $(eval $(call not_available_for_platform_rule,$(i),$(m)))))
endif endif
endif