Rename UpdatableBootJars to ApexBootJars.
Note that ART apex boot jars and core-icu4j are exceptions here as they are not part of ApexBootJars. ART apex boot jars are defined in their own variable, while core-icu4j is treated as a regular non-updatable boot jar. Bug: 191127295 Test: atest CtsClasspathsTestCases Change-Id: I5f5feb7344941d0154f384e3c06279d49b490768
This commit is contained in:
parent
65e68bb263
commit
8bc189e39f
2 changed files with 2 additions and 2 deletions
|
@ -104,7 +104,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
|
|||
$(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
|
||||
$(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR))
|
||||
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
|
||||
$(call add_json_list, UpdatableBootJars, $(PRODUCT_APEX_BOOT_JARS))
|
||||
$(call add_json_list, ApexBootJars, $(PRODUCT_APEX_BOOT_JARS))
|
||||
$(call add_json_list, ArtApexJars, $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
|
||||
$(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))
|
||||
$(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS))
|
||||
|
|
|
@ -142,7 +142,7 @@ $(call add_json_bool, UncompressPrivAppDex, $(call invert_bool,$(fi
|
|||
$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
|
||||
|
||||
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
|
||||
$(call add_json_list, UpdatableBootJars, $(PRODUCT_APEX_BOOT_JARS))
|
||||
$(call add_json_list, ApexBootJars, $(PRODUCT_APEX_BOOT_JARS))
|
||||
|
||||
$(call add_json_bool, VndkUseCoreVariant, $(TARGET_VNDK_USE_CORE_VARIANT))
|
||||
$(call add_json_bool, VndkSnapshotBuildArtifacts, $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))
|
||||
|
|
Loading…
Reference in a new issue