From fcf124988d890cd46d8edfc0ce57766a7a95801f Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Tue, 6 Aug 2024 16:28:31 +0000 Subject: [PATCH] Install cppreopts.sh to copy dexpreopt files on first boot This relands https://r.android.com/3205048 without the `BOARD_USES_SYSTEM_OTHER_ODEX` conditional. Board config runs after product config, so the value of `BOARD_USES_SYSTEM_OTHER_ODEX` is not available in runtime_libart.mk Adding cppreopts.sh to PRODUCT_PACKAGES ensures that the dexpreopt files can be copied from system_other to /data on first boot. Test: lunch aosp_cheetah-trunk_staging-userdebug Test: get_build_var PRODUCT_SYSTEM_PROPERTIES # verified that ro.cp_system_other_odex=1 is present (this was incorrectly removed from build.prop after https://r.android.com/3205048) Test: device boot test go/abtd https://android-build.corp.google.com/builds/abtd/run/L83800030005663221 (this failed previously with https://r.android.com/3205048) Bug: 356075780 Change-Id: I6a596373bbbe8587620c5867fb43fcbf3f3b2b2b --- target/product/runtime_libart.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 58234a8a8c..9e8afa85a4 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -181,3 +181,5 @@ PRODUCT_SYSTEM_PROPERTIES += \ # Copy preopted files from system_b on first boot. PRODUCT_SYSTEM_PROPERTIES += ro.cp_system_other_odex=1 +PRODUCT_PACKAGES += \ + cppreopts.sh