tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update build files to new compiler filters." am: 6c8c20dd5b

Browse source 
am: 39568a6783

Change-Id: Ic31ecc16969b15f961f8126bade07a7daf42ec9d
This commit is contained in:
Nicolas Geoffray 2017-04-27 11:56:38 +00:00 committed by android-build-merger
commit 225fd8057f
3 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
target/product/core_minimal.mk
View file

@ -128,27 +128,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.txt system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.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 # 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,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/compiled-classes-phone:system/etc/compiled-classes) frameworks/base/compiled-classes-phone:system/etc/compiled-classes)

20
target/product/core_tiny.mk
View file

@ -113,26 +113,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown 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/runtime_libart.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)

21
target/product/runtime_libart.mk
View file

@ -82,3 +82,24 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
dalvik.vm.usejitprofiles=true \ dalvik.vm.usejitprofiles=true \
dalvik.vm.dexopt.secondary=true \ dalvik.vm.dexopt.secondary=true \
dalvik.vm.appimageformat=lz4 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