From 10030bced555ceab4dc41f677d0350fecfaa56cf Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 25 Apr 2017 12:25:33 +0100 Subject: [PATCH] Update build files to new compiler filters. bug:34715556 Test: build and boot aosp bullhead (cherry picked from commit 0576b5f24ee5499660f465a26c90d0298954291c) Change-Id: I75586e2eaa40480470115c89cf1c049313850fe9 --- target/product/core_minimal.mk | 21 --------------------- target/product/core_tiny.mk | 20 -------------------- target/product/runtime_libart.mk | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 41 deletions(-) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 974cf8fcf..5a18c7093 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -142,27 +142,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt -# Different dexopt types for different package update/install times. -# On eng builds, make "boot" reasons do pure JIT for faster turnaround. -ifeq (eng,$(TARGET_BUILD_VARIANT)) - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.first-boot=verify-at-runtime \ - pm.dexopt.boot=verify-at-runtime -else - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.first-boot=interpret-only \ - pm.dexopt.boot=verify-profile -endif -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.install=interpret-only \ - pm.dexopt.bg-dexopt=speed-profile \ - pm.dexopt.ab-ota=speed-profile \ - pm.dexopt.nsys-library=speed \ - pm.dexopt.shared-apk=speed \ - pm.dexopt.forced-dexopt=speed \ - pm.dexopt.core-app=speed - - # Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ frameworks/base/compiled-classes-phone:system/etc/compiled-classes) diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 3692cf15d..4786b4390 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -120,26 +120,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.carrier=unknown -# Different dexopt types for different package update/install times. -# On eng builds, make "boot" reasons do pure JIT for faster turnaround. -ifeq (eng,$(TARGET_BUILD_VARIANT)) - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.first-boot=verify-at-runtime \ - pm.dexopt.boot=verify-at-runtime -else - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.first-boot=interpret-only \ - pm.dexopt.boot=verify-profile -endif -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - pm.dexopt.install=interpret-only \ - pm.dexopt.bg-dexopt=speed-profile \ - pm.dexopt.ab-ota=speed-profile \ - pm.dexopt.nsys-library=speed \ - pm.dexopt.shared-apk=speed \ - pm.dexopt.forced-dexopt=speed \ - pm.dexopt.core-app=speed - $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index fb52d67e5..ffdd9040a 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -82,3 +82,24 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ dalvik.vm.usejitprofiles=true \ dalvik.vm.dexopt.secondary=true \ dalvik.vm.appimageformat=lz4 + +# Different dexopt types for different package update/install times. +# On eng builds, make "boot" reasons only extract for faster turnaround. +ifeq (eng,$(TARGET_BUILD_VARIANT)) + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + pm.dexopt.first-boot=extract \ + pm.dexopt.boot=extract +else + PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + pm.dexopt.first-boot=quicken \ + pm.dexopt.boot=verify +endif + +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + pm.dexopt.install=quicken \ + pm.dexopt.bg-dexopt=speed-profile \ + pm.dexopt.ab-ota=speed-profile \ + pm.dexopt.nsys-library=speed \ + pm.dexopt.shared-apk=speed \ + pm.dexopt.forced-dexopt=speed \ + pm.dexopt.core-app=speed