Merge "Build: Only use compiled-classes file when available" into nyc-dev

am: 57c3aea442

* commit '57c3aea442bff67e4452eee7ff8f13294fbad34b':
  Build: Only use compiled-classes file when available

Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
This commit is contained in:
Andreas Gampe 2016-05-23 20:48:00 +00:00 committed by android-build-merger
commit 5d558c5f13

View file

@ -144,8 +144,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
pm.dexopt.forced-dexopt=speed
# Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
PRODUCT_COPY_FILES += \
frameworks/base/compiled-classes-phone:system/etc/compiled-classes
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
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/base.mk)