Commit 7ea8a3d9 authored Feb 07, 2020 by Vladimir Marko

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$' <oat-file> | \
          xargs -0 echo | gawk '{print $2}'
Bug: 119800099
Change-Id: I241b65d7323901906ffcde91ca9ba173e1755ad7

parent 30bbf37d

core/dex_preopt_odex_install.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -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