tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1 am: bfb27d2a25

Browse source 
Change-Id: I37804034f42176f397197eeaa6a363331e10e765
This commit is contained in:
Automerger Merge Worker 2020-02-09 23:33:08 +00:00
commit 7d1ed118eb
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dex_preopt_config.mk
View file

@ -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))

6
core/dex_preopt_odex_install.mk
View file

@ -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)))

3
target/board/BoardConfigMainlineCommon.mk
View file

@ -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