diff --git a/target/product/base.mk b/target/product/base.mk
index 6387fda..0d052b5 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -118,5 +118,10 @@
 PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
     frameworks/base/preloaded-classes:system/etc/preloaded-classes)
 
+# Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath
+#       classes will be compiled.
+PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
+    frameworks/base/compiled-classes:system/etc/compiled-classes)
+
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)