Merge "Build: Only use compiled-classes file when available" into nyc-dev am: 57c3aea442 am: 5d558c5f13

am: 8666487b4a

* commit '8666487b4aed7062022835e00133e4038500d63a':
  Build: Only use compiled-classes file when available

Change-Id: I1d67876deb38c69bf320497b13d09ba801d6022c
This commit is contained in:
Andreas Gampe 2016-05-23 20:59:43 +00:00 committed by android-build-merger
commit de3371e60e

View file

@ -144,8 +144,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
pm.dexopt.forced-dexopt=speed pm.dexopt.forced-dexopt=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 += \ 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)
$(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)