From 7ea8a3d9fa114c31694176649a371b24500cbbff Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 7 Feb 2020 14:40:00 +0000 Subject: [PATCH] Use ART image for make-based preopt. Test: taimen-userdebug boots when built with DEXPREOPT_USE_ART_IMAGE=true Test: Check logcat for checksum verification failures. (Build ART with extra logging in OatFileAssistant.) Test: Check that bootclasspath-checksums from some prebuilt oat files contain only one image checksum followed by dex file checksums with grep -az -A1 -E '^bootclasspath-checksums$' | \ xargs -0 echo | gawk '{print $2}' Bug: 119800099 Change-Id: I241b65d7323901906ffcde91ca9ba173e1755ad7 --- core/dex_preopt_odex_install.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 0fb2dd2b4..d708014c3 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -113,8 +113,14 @@ my_dexpreopt_images := my_dexpreopt_images_deps := my_dexpreopt_image_locations := 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