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

Commit 54e1a402 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Otapreopt: Check dexopt return status before retry 

Only retry compilation (triggering a wipe and boot image regeneration)
when dex2oat failed in runtime creation.

(cherry picked from commit 2c925927)

Bug: 36336122
Test: m
Test: Device boots
Test: Can install apps
Test: Can run A/B OTA
Change-Id: I1a2ae3a871a926002980acd8b7fa777fe8f7d739
parent 1636e003

cmds/installd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ LOCAL_CFLAGS += -DART_BASE_ADDRESS_MIN_DELTA=$(LOCAL_LIBART_IMG_HOST_MIN_BASE_AD 
LOCAL_CFLAGS += -DART_BASE_ADDRESS_MAX_DELTA=$(LOCAL_LIBART_IMG_HOST_MAX_BASE_ADDRESS_DELTA)



LOCAL_SRC_FILES := otapreopt.cpp globals.cpp utils.cpp dexopt.cpp

LOCAL_HEADER_LIBRARIES := dex2oat_headers

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \

cmds/installd/otapreopt.cpp

+6 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <android-base/strings.h>

#include <cutils/fs.h>

#include <cutils/properties.h>

#include <dex2oat_return_codes.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>
@@ -576,7 +577,11 @@ private: 
        }



        // If the dexopt failed, we may have a stale boot image from a previous OTA run.

        // Try to delete and retry.

        // Then regenerate and retry.

        if (WEXITSTATUS(dexopt_result) !=

                static_cast<int>(art::dex2oat::ReturnCode::kCreateRuntime)) {

            return dexopt_result;

        }



        if (!PrepareBootImage(/* force */ true)) {

            LOG(ERROR) << "Forced boot image creating failed. Original error return was "