Merge "Use ART image for make-based preopt."

This commit is contained in:
Vladimir Marko
2020-02-07 16:58:04 +00:00
committed by Gerrit Code Review

View File

@@ -113,8 +113,14 @@ my_dexpreopt_images :=
my_dexpreopt_images_deps := my_dexpreopt_images_deps :=
my_dexpreopt_image_locations := my_dexpreopt_image_locations :=
my_dexpreopt_infix := boot my_dexpreopt_infix := boot
ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))
my_dexpreopt_infix := art
endif
ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE)) ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE))
my_dexpreopt_infix := jitzygote-boot my_dexpreopt_infix := jitzygote-boot
ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))
my_dexpreopt_infix := jitzygote-art
endif
endif endif
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT