Commit 9c54f382 authored Aug 02, 2024 by Spandan Das

Prevent misconfigured cp_system_other_odex=1 device boots

https://r.android.com/3177659 set ro.cp_system_other_odex=1 to request
copy of the dexpreopt app images to system_other partition on first
boot. This created a misconfiguration for devices that
1. Do not have a system_other partition
2. Do not have cppreopts.sh listed in PRODUCT_PACKAGES

This CL adds a conditional to request this copy operation in devices
with a system_other partition, and adds cppreopts.sh to PRODUCT_PACKAGES

Test: presubmits
Bug: 356075780

Change-Id: I703c15a5fd96d1efad7f93e6bcb1b968ae4f38a1

parent 5228a6f4

target/product/runtime_libart.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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