From bbb0b31cf229170fa527d57a11a0d20c3dbf87a2 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Fri, 20 May 2016 11:05:38 -0700
Subject: [PATCH] Build: Only use compiled-classes file when available

Don't pull in things from frameworks/base when they're not there.

Bug: 28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
---
 target/product/core_minimal.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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