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

1 files changed, 1 insertions, 1 deletions

diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index ae73f49508..94391eb957 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -936,7 +936,7 @@ bool CompilerDriver::ShouldCompileBasedOnProfile(const MethodReference& method_r
   // If compiling the apex image, filter out methods not in an apex file (the profile used
   // for boot classpath is the same between the apex image and the boot image, so it includes
   /// framewkro methods).
-  if (compiler_options_->IsApexBootImage() &&
+  if (compiler_options_->IsApexBootImageExtension() &&
       !android::base::StartsWith(method_ref.dex_file->GetLocation(), "/apex")) {
     return false;
   }