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

Commit 3e446c96 authored by Roland Levillain's avatar Roland Levillain Committed by android-build-merger
Browse files

Merge "Check that a Runtime APEX has been activated before running otapreopt."... 

Merge "Check that a Runtime APEX has been activated before running otapreopt." am: 59234af3 am: d55a4272 am: 0c5bf694
am: 5c092f7e

Change-Id: I8b10c5d8c78031d3e17bfd57297cf373042b5ec5
parents 7a7cc0d5 5c092f7e

cmds/installd/otapreopt_chroot.cpp

+12 −0
Original line number Diff line number Diff line
@@ -236,6 +236,18 @@ static int otapreopt_chroot(const int argc, char **arg) { 
    // the Android Runtime APEX, as it is required by otapreopt to run dex2oat.

    std::vector<apex::ApexFile> active_packages = ActivateApexPackages();



    // Check that an Android Runtime APEX has been activated; clean up and exit

    // early otherwise.

    if (std::none_of(active_packages.begin(),

                     active_packages.end(),

                     [](const apex::ApexFile& package){

                         return package.GetManifest().name() == "com.android.runtime";

                     })) {

        LOG(FATAL_WITHOUT_ABORT) << "No activated com.android.runtime APEX package.";

        DeactivateApexPackages(active_packages);

        exit(217);

    }



    // Now go on and run otapreopt.



    // Incoming:  cmd + status-fd + target-slot + cmd...      | Incoming | = argc