diff options
| -rw-r--r-- | core/dex_preopt_config.mk | 2 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 6 | ||||
| -rw-r--r-- | target/board/BoardConfigMainlineCommon.mk | 3 |
3 files changed, 0 insertions, 11 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index cd73843907..ccf53f5229 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -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)) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index d708014c3a..a33b2b4d53 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -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))) diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index 52ba814319..c57968eed3 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -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 |