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

Commit d2712659 authored by Alex Light's avatar Alex Light Committed by Automerger Merge Worker
Browse files

Make otapreopt_chroot setup linker am: 2b307a09 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I322af33b91eccb67053a77652d85b7cb3d0d1bf7
parents 241b62b2 2b307a09

cmds/installd/otapreopt_chroot.cpp

+34 −8
Original line number Diff line number Diff line
@@ -185,6 +185,13 @@ static int otapreopt_chroot(const int argc, char **arg) { 
    // want it for product APKs. Same notes as vendor above.

    TryExtraMount("product", arg[2], "/postinstall/product");



    constexpr const char* kPostInstallLinkerconfig = "/postinstall/linkerconfig";

    // Try to mount /postinstall/linkerconfig. we will set it up after performing the chroot

    if (mount("tmpfs", kPostInstallLinkerconfig, "tmpfs", 0, nullptr) != 0) {

        PLOG(ERROR) << "Failed to mount a tmpfs for " << kPostInstallLinkerconfig;

        exit(215);

    }



    // Setup APEX mount point and its security context.

    static constexpr const char* kPostinstallApexDir = "/postinstall/apex";

    // The following logic is similar to the one in system/core/rootdir/init.rc:
@@ -246,15 +253,34 @@ static int otapreopt_chroot(const int argc, char **arg) { 


    // Check that an ART 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.art";

    static constexpr const std::string_view kRequiredApexs[] = {

      "com.android.art",

      "com.android.runtime",

    };

    for (std::string_view apex : kRequiredApexs) {

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

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

                             return package.GetManifest().name() == apex;

                         })) {

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

            LOG(FATAL_WITHOUT_ABORT) << "No activated " << apex << " APEX package.";

            DeactivateApexPackages(active_packages);

            exit(217);

        }

    }



    // Setup /linkerconfig. Doing it after the chroot means it doesn't need its own category

    if (selinux_android_restorecon("/linkerconfig", 0) < 0) {

        PLOG(ERROR) << "Failed to restorecon /linkerconfig";

        exit(219);

    }

    std::vector<std::string> linkerconfig_cmd{"/apex/com.android.runtime/bin/linkerconfig",

                                              "--target", "/linkerconfig"};

    std::string linkerconfig_error_msg;

    bool linkerconfig_exec_result = Exec(linkerconfig_cmd, &linkerconfig_error_msg);

    if (!linkerconfig_exec_result) {

        LOG(ERROR) << "Running linkerconfig failed: " << linkerconfig_error_msg;

        exit(218);

    }



    // Now go on and run otapreopt.