Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0616a1a4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['android-review.googlesource.com/3131796'] into 24Q3-release.

Change-Id: Id7c7f3b1b3c18e7db16c1f5df11b010579a8e3ed
parents 50e5df02 dadc956b
Loading
Loading
Loading
Loading
+20 −15
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ function infinite_source {
  done
}

PR_DEXOPT_JOB_VERSION="$(pm art pr-dexopt-job --version)"
if (( $? == 0 )) && (( $PR_DEXOPT_JOB_VERSION >= 2 )); then
  # Delegate to Pre-reboot Dexopt, a feature of ART Service.
  # ART Service decides what to do with this request:
  # - If Pre-reboot Dexopt is disabled or unsupported, the command returns
@@ -75,6 +77,9 @@ if infinite_source | pm art on-ota-staged --slot "$TARGET_SLOT_SUFFIX"; then
    exit 0
  fi
  echo "Pre-reboot Dexopt not enabled. Fall back to otapreopt."
else
  echo "Pre-reboot Dexopt is too old. Fall back to otapreopt."
fi

if [ "$(/system/bin/otapreopt_chroot --version)" != 2 ]; then
  # We require an updated chroot wrapper that reads dexopt commands from stdin.