Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1
Change-Id: I7b58e16d9c0ec0784ba86ee0ed102b6a49d661cf
This commit is contained in:
commit
bfb27d2a25
3 changed files with 0 additions and 11 deletions
|
@ -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))
|
||||
|
|
|
@ -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)))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue