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

am: 5d558c5f13

* commit '5d558c5f13dbff6e6e51e543f86cc6ff66be630a':
  Build: Only use compiled-classes file when available

Change-Id: Ia64b363e5cbf7b7a6794332fea39b79f010435e3
This commit is contained in:
Vikas Marwaha 2016-05-23 20:51:10 +00:00 committed by android-build-merger
commit 8666487b4a
1 changed files with 2 additions and 2 deletions

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)