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

Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint."

This commit is contained in:
Ulyana Trafimovich 2020-02-13 10:53:13 +00:00 committed by Android (Google) Code Review
parent 8b50f17e22 19ed3a0db7
commit 6780e0aaa1
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/product_config.mk
View File

@ -265,9 +265,9 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
endif endif
$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS), \ $(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS), \
$(if $(findstring $(call word-colon,2,$(pair)),$(PRODUCT_BOOT_JARS)),, \ $(if $(findstring $(call word-colon,2,$(pair)),$(PRODUCT_BOOT_JARS)), \
$(error Every jar in PRODUCT_UPDATABLE_BOOT_JARS must also be in PRODUCT_BOOT_JARS, \ $(error A jar in PRODUCT_UPDATABLE_BOOT_JARS must not be in PRODUCT_BOOT_JARS, \
$(call word-colon,2,$(pair)) is not) \ but $(call word-colon,2,$(pair)) is) \
) \ ) \
) )

1
core/soong_config.mk
View File

@ -138,6 +138,7 @@ $(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(fi
$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES)) $(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
$(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOOT_JARS))
$(call add_json_bool, VndkUseCoreVariant, $(TARGET_VNDK_USE_CORE_VARIANT)) $(call add_json_bool, VndkUseCoreVariant, $(TARGET_VNDK_USE_CORE_VARIANT))
$(call add_json_bool, VndkSnapshotBuildArtifacts, $(VNDK_SNAPSHOT_BUILD_ARTIFACTS)) $(call add_json_bool, VndkSnapshotBuildArtifacts, $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))

6
core/tasks/boot_jars_package_check.mk
View File

@ -32,11 +32,7 @@ updatable_boot_jars := $(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),\
#TODO(jiyong) merge art_boot_jars into updatable_boot_jars #TODO(jiyong) merge art_boot_jars into updatable_boot_jars
art_boot_jars := $(addsuffix .com.android.art.release,$(filter $(ART_APEX_JARS),$(PRODUCT_BOOT_JARS))) art_boot_jars := $(addsuffix .com.android.art.release,$(filter $(ART_APEX_JARS),$(PRODUCT_BOOT_JARS)))
platform_boot_jars := $(filter-out \ platform_boot_jars := $(filter-out $(ART_APEX_JARS),$(PRODUCT_BOOT_JARS))
$(ART_APEX_JARS)\
$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS),$(call word-colon,2,$(pair))),\
$(PRODUCT_BOOT_JARS)\
)
built_boot_jars := $(foreach j, $(updatable_boot_jars) $(art_boot_jars) $(platform_boot_jars), \ built_boot_jars := $(foreach j, $(updatable_boot_jars) $(art_boot_jars) $(platform_boot_jars), \
$(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar) $(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar)

11
target/product/base_system.mk
View File

@ -323,21 +323,12 @@ endif
# The order matters for runtime class lookup performance. # The order matters for runtime class lookup performance.
PRODUCT_BOOT_JARS := \ PRODUCT_BOOT_JARS := \
$(TARGET_CORE_JARS) \ $(ART_APEX_JARS) \
framework-minus-apex \ framework-minus-apex \
ext \ ext \
telephony-common \ telephony-common \
voip-common \ voip-common \
ims-common \ ims-common \
framework-sdkextensions \
framework-statsd \
ike \
updatable-media \
framework-mediaprovider \
framework-permission \
framework-appsearch \
framework-wifi \
framework-tethering \
framework-telephony framework-telephony
PRODUCT_UPDATABLE_BOOT_JARS := \ PRODUCT_UPDATABLE_BOOT_JARS := \