Update build files to new compiler filters.

bug:34715556
Test: build and boot aosp bullhead

(cherry picked from commit 0576b5f24e)

Change-Id: I75586e2eaa40480470115c89cf1c049313850fe9
This commit is contained in:
Nicolas Geoffray 2017-04-25 12:25:33 +01:00
parent c9ad35ce39
commit 10030bced5
3 changed files with 21 additions and 41 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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