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

Commit 2bcf499b authored by satayev's avatar satayev Committed by Gerrit Code Review
Browse files

Merge "Rename UpdatableBootJars to ApexBootJars."

parents 76e3fb05 8bc189e3

core/dex_preopt_config.mk

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

core/soong_config.mk

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