Merge "Otapreopt: Check dexopt return status before retry" into oc-dev

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 \

#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>

        }

        // 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 "