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

Merge "Auto-include device_manifest.xml when necessary"

This commit is contained in:
Anton Hansson 2019-01-28 09:18:34 +00:00 committed by Gerrit Code Review
parent 93626d9616 d5e069e405
commit 096b88bf90
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/main.mk
View File

@ -1041,6 +1041,14 @@ define resolve-product-relative-paths
$(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2))))))) $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2)))))))
endef endef
# Returns modules included automatically as a result of certain BoardConfig
# variables being set.
define auto-included-modules
$(if $(BOARD_VNDK_VERSION),vndk_package) \
$(if $(DEVICE_MANIFEST_FILE),device_manifest.xml) \
endef
# Lists most of the files a particular product installs, including: # Lists most of the files a particular product installs, including:
# - PRODUCT_PACKAGES, and their LOCAL_REQUIRED_MODULES # - PRODUCT_PACKAGES, and their LOCAL_REQUIRED_MODULES
# - PRODUCT_COPY_FILES # - PRODUCT_COPY_FILES
@ -1064,7 +1072,7 @@ define product-installed-files
$(if $(filter debug,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG)) \ $(if $(filter debug,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG)) \
$(if $(filter tests,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_TESTS)) \ $(if $(filter tests,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_TESTS)) \
$(if $(filter asan,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_ASAN)) \ $(if $(filter asan,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_ASAN)) \
$(if $(BOARD_VNDK_VERSION),vndk_package) \ $(call auto-included-modules) \
) \ ) \
$(eval ### Filter out the overridden packages and executables before doing expansion) \ $(eval ### Filter out the overridden packages and executables before doing expansion) \
$(eval _pif_overrides := $(call module-overrides,$(_pif_modules))) \ $(eval _pif_overrides := $(call module-overrides,$(_pif_modules))) \
@ -1123,6 +1131,9 @@ ifdef FULL_BUILD
static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% $(SOONG_OUT_DIR)/ndk/% static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% $(SOONG_OUT_DIR)/ndk/%
# RROs become REQUIRED by the source module, but are always placed on the vendor partition. # RROs become REQUIRED by the source module, but are always placed on the vendor partition.
static_whitelist_patterns += %__auto_generated_rro.apk static_whitelist_patterns += %__auto_generated_rro.apk
# Auto-included targets are not considered
static_whitelist_patterns += $(call module-installed-files,$(call auto-included-modules))
ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX)) ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX))
# Allow system_other odex space optimization. # Allow system_other odex space optimization.
static_whitelist_patterns += \ static_whitelist_patterns += \

1
target/product/base_vendor.mk
View File

@ -55,5 +55,4 @@ PRODUCT_PACKAGES += \
# VINTF data for vendor image # VINTF data for vendor image
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
device_manifest.xml \
device_compatibility_matrix.xml \ device_compatibility_matrix.xml \

5
target/product/generic.mk
View File

@ -25,7 +25,4 @@ PRODUCT_BRAND := generic
PRODUCT_DEVICE := generic PRODUCT_DEVICE := generic
PRODUCT_NAME := generic PRODUCT_NAME := generic
_whitelist := \ $(call enforce-product-packages-exist,)
device_manifest.xml \
$(call enforce-product-packages-exist,$(_whitelist))