Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81dde7da authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am:... 

Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496 am: 0296ecb6

Change-Id: I61cfc99b2e7af60c1603506bb8e1243a9af29808
parents 32773f7e 0296ecb6

core/product_config.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -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) \

  ) \

  ) \

)

)

core/soong_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -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))

core/tasks/boot_jars_package_check.mk

+1 −5
Original line number Original line Diff line number Diff line
@@ -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)

target/product/base_system.mk

+1 −5
Original line number Original line Diff line number Diff line
@@ -318,16 +318,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 \

    ike \

    updatable-media \

    framework-tethering





PRODUCT_UPDATABLE_BOOT_JARS := \

PRODUCT_UPDATABLE_BOOT_JARS := \

    com.android.conscrypt:conscrypt \

    com.android.conscrypt:conscrypt \