diff options
| author | Ulya Trafimovich <skvadrik@google.com> | 2020-01-27 14:50:38 +0000 |
|---|---|---|
| committer | Ulyana Trafimovich <skvadrik@google.com> | 2020-01-28 17:04:36 +0000 |
| commit | c124d1dd977a2ddcd6e4928cfe6c0698f44d6523 (patch) | |
| tree | b3cbe2ead73a9ca14845f0b37d1254f8d81e79da /compiler/optimizing/graph_visualizer.cc | |
| parent | caafd621eb33863630380818db918a2c93c9054e (diff) | |
Fix name-based detection of JIT-zygote boot image extension.
ART detects JIT-zygote boot image by the image name. This has been
broken since boot image extension has been enabled for JIT-zygote
config in CL I5493e575ebf90bad1d5ad2850004d54590bbc079.
This CL replaces 'kApexBootImage' with 'kApexBootImageExtension',
since the JIT-zygote image is always used with extension.
Test: compare boot-framework.art and apex-framework.art,
they were identical before this CL, and differ after this CL.
Test: JIT-zygote config boots, steps 1-2:
1. Temporarily enable Jit zygote in the product device config (in
this case device/google/muskie/aosp_walleye.mk):
+# System server should not contain compiled code.
+PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := verify
+
+# Use the apex image for preopting.
+DEXPREOPT_USE_APEX_IMAGE := true
+
+# Have the runtime pick up the apex image.
+PRODUCT_PROPERTY_OVERRIDES += \
+ dalvik.vm.boot-image=/apex/com.android.art/javalib/apex.art:/system/framework/apex-framework.art
2. Build and flash:
$ lunch aosp_walleye-userdebug && m \
&& adb reboot bootloader && fastboot flashall -w
Change-Id: Ifd3d3c13107c2e4514eed7c4e2b1bbc5a5a12245
Diffstat (limited to 'compiler/optimizing/graph_visualizer.cc')
0 files changed, 0 insertions, 0 deletions