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

Commit 0da68238 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make otapreopt actually print dexopt error messages" am: c0c5fae6 am:... 

Merge "Make otapreopt actually print dexopt error messages" am: c0c5fae6 am: 171ceecf am: 63d9b79a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1608218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018cca997da4abd0181088a9d4459ab62d81c02e
parents 886de144 63d9b79a

cmds/installd/otapreopt.cpp

+23 −18
Original line number Original line Diff line number Diff line
@@ -473,8 +473,8 @@ private: 
    // Run dexopt with the parameters of parameters_.

    // Run dexopt with the parameters of parameters_.

    // TODO(calin): embed the profile name in the parameters.

    // TODO(calin): embed the profile name in the parameters.

    int Dexopt() {

    int Dexopt() {

        std::string dummy;

        std::string error;

        return dexopt(parameters_.apk_path,

        int res = dexopt(parameters_.apk_path,

                         parameters_.uid,

                         parameters_.uid,

                         parameters_.pkgName,

                         parameters_.pkgName,

                         parameters_.instruction_set,

                         parameters_.instruction_set,
@@ -490,7 +490,12 @@ private: 
                         parameters_.profile_name,

                         parameters_.profile_name,

                         parameters_.dex_metadata_path,

                         parameters_.dex_metadata_path,

                         parameters_.compilation_reason,

                         parameters_.compilation_reason,

                      &dummy);

                         &error);

        if (res != 0) {

            LOG(ERROR) << "During preopt of " << parameters_.apk_path << " got result " << res

                       << " error: " << error;

        }

        return res;

    }

    }





    int RunPreopt() {

    int RunPreopt() {