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

Commit 5d310897 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Update linker configuration when loading apex" am: 11e757c9 am: 6bfcefca 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155096



Change-Id: I57b764beba19aca68efba6c8a66b30c2b03ff78d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3976090 6bfcefca

init/init.cpp

+25 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <libavb/libavb.h>

#include <libgsi/libgsi.h>

#include <libsnapshot/snapshot.h>

#include <logwrap/logwrap.h>

#include <processgroup/processgroup.h>

#include <processgroup/setup.h>

#include <selinux/android.h>
@@ -453,9 +454,33 @@ static Result<void> DoUnloadApex(const std::string& apex_name) { 
    return {};

}



static Result<void> UpdateApexLinkerConfig(const std::string& apex_name) {

    // Do not invoke linkerconfig when there's no bin/ in the apex.

    const std::string bin_path = "/apex/" + apex_name + "/bin";

    if (access(bin_path.c_str(), R_OK) != 0) {

        return {};

    }

    const char* linkerconfig_binary = "/apex/com.android.runtime/bin/linkerconfig";

    const char* linkerconfig_target = "/linkerconfig";

    const char* arguments[] = {linkerconfig_binary, "--target", linkerconfig_target, "--apex",

                               apex_name.c_str(),   "--strict"};



    if (logwrap_fork_execvp(arraysize(arguments), arguments, nullptr, false, LOG_KLOG, false,

                            nullptr) != 0) {

        return ErrnoError() << "failed to execute linkerconfig";

    }

    LOG(INFO) << "Generated linker configuration for " << apex_name;

    return {};

}



static Result<void> DoLoadApex(const std::string& apex_name) {

    std::string prop_name = "init.apex." + apex_name;

    // TODO(b/232799709) read .rc files from the apex



    if (auto result = UpdateApexLinkerConfig(apex_name); !result.ok()) {

        return result.error();

    }



    SetProperty(prop_name, "loaded");

    return {};

}