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

Commit 4faef387 authored by Ulya Trofimovich's avatar Ulya Trofimovich Committed by Gerrit Code Review
Browse files

Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed."

parents 542399a8 30142ffc

core/dex_preopt_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, DisablePreoptModules,                    $(DEXPREOPT_DISABLED_MODULES))

  $(call add_json_bool, OnlyPreoptBootImageAndSystemServer,      $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))

  $(call add_json_bool, PreoptWithUpdatableBcp,                  $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP)))

  $(call add_json_bool, UseArtImage,                             $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))

  $(call add_json_bool, DontUncompressPrivAppsDex,               $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))

  $(call add_json_list, ModulesLoadedByPrivilegedModules,        $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))

  $(call add_json_bool, HasSystemOther,                          $(BOARD_USES_SYSTEM_OTHER_ODEX))

core/dex_preopt_odex_install.mk

+5 −3
Original line number Diff line number Diff line
@@ -272,11 +272,13 @@ my_dexpreopt_images := 
my_dexpreopt_images_deps :=

my_dexpreopt_image_locations_on_host :=

my_dexpreopt_image_locations_on_device :=

# Infix can be 'boot' or 'art'. Soong creates a set of variables for Make, one

# for each boot image (primary and the framework extension). The only reason why

# the primary image is exposed to Make is testing (art gtests) and benchmarking

# (art golem benchmarks). Install rules that use those variables are in

# dex_preopt_libart.mk. Here for dexpreopt purposes the infix is always 'boot'.

my_dexpreopt_infix := boot

my_create_dexpreopt_config :=

ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))

  my_dexpreopt_infix := art

endif



ifdef LOCAL_DEX_PREOPT

  ifeq (,$(filter PRESIGNED,$(LOCAL_CERTIFICATE)))