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

Commit 6750886f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84 am: bfb27d2a am: 7d1ed118 

Change-Id: I19576a4c5d18ea52801ecefe805d6d62969054ed
parents 377ea20d 7d1ed118

core/dex_preopt_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,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, UseArtImage,                        $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))

  $(call add_json_bool, GenerateApexImage,                  $(filter true,$(DEXPREOPT_GENERATE_APEX_IMAGE)))

  $(call add_json_bool, UseApexImage,                       $(filter true,$(DEXPREOPT_USE_APEX_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

+0 −6
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ my_dexpreopt_infix := boot 
ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))

  my_dexpreopt_infix := art

endif

ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE))

  my_dexpreopt_infix := jitzygote-boot

  ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))

    my_dexpreopt_infix := jitzygote-art

  endif

endif



ifdef LOCAL_DEX_PREOPT

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

target/board/BoardConfigMainlineCommon.mk

+0 −3
Original line number Diff line number Diff line
@@ -46,6 +46,3 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 


# Include stats logging code in LMKD

TARGET_LMKD_STATS_LOG := true
 


# Generate an APEX image for experiment b/119800099.

DEXPREOPT_GENERATE_APEX_IMAGE := true