commit 57c3aea442bff67e4452eee7ff8f13294fbad34b
author Vikas Marwaha <vikasmarwaha@google.com> Mon May 23 20:39:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 23 20:39:56 2016 +0000
tree 706cedd9ae51ebb33407ccd377b9e80d5e8c62b6
parent 0418406186f67096a3c42fa276799095620e2296
parent bbb0b31cf229170fa527d57a11a0d20c3dbf87a2

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

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 7504d01..91d5d26 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -142,8 +142,8 @@
     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)