diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 58234a8a8c..68a4a72647 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -180,4 +180,9 @@ PRODUCT_SYSTEM_PROPERTIES += \
     dalvik.vm.enable_pr_dexopt=true
 
 # Copy preopted files from system_b on first boot.
+ifeq ($(BOARD_USES_SYSTEM_OTHER_ODEX),true)
 PRODUCT_SYSTEM_PROPERTIES += ro.cp_system_other_odex=1
+
+PRODUCT_PACKAGES += \
+        cppreopts.sh
+endif