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

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

Merge "Dedup apex-scanning" into main am: 5a2d8514 am: 00144f0a am: 5f05732c 

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



Change-Id: Ide7c0e2226ba9bf28db210831efa30fd671bef57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce7281eb 5f05732c

init/apex_init_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static Result<std::vector<std::string>> CollectRcScriptsFromApex( 
    return configs;

}



static std::set<std::string> GetApexListFrom(const std::string& apex_dir) {

std::set<std::string> GetApexListFrom(const std::string& apex_dir) {

    std::set<std::string> apex_list;

    auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir(apex_dir.c_str()), closedir);

    if (!dirp) {

init/apex_init_util.h

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#pragma once



#include <set>

#include <string>

#include <vector>
@@ -24,6 +25,9 @@ 
namespace android {

namespace init {



// Scans apex_dir (/apex) to get the list of active APEXes.

std::set<std::string> GetApexListFrom(const std::string& apex_dir);



// Parse all RC scripts for a given apex.

Result<void> ParseRcScriptsFromApex(const std::string& apex_name);

init/builtins.cpp

+8 −22
Original line number Diff line number Diff line
@@ -1269,26 +1269,15 @@ static Result<void> do_update_linker_config(const BuiltinArguments&) { 
/*

 * Creates a directory under /data/misc/apexdata/ for each APEX.

 */

static Result<void> create_apex_data_dirs() {

    auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/apex"), closedir);

    if (!dirp) {

        return ErrnoError() << "Unable to open apex directory";

    }

    struct dirent* entry;

    while ((entry = readdir(dirp.get())) != nullptr) {

        if (entry->d_type != DT_DIR) continue;



        const char* name = entry->d_name;

        // skip any starting with "."

        if (name[0] == '.') continue;



        if (strchr(name, '@') != nullptr) continue;



        auto path = "/data/misc/apexdata/" + std::string(name);

static void create_apex_data_dirs() {

    for (const auto& name : GetApexListFrom("/apex")) {

        auto path = "/data/misc/apexdata/" + name;

        auto options = MkdirOptions{path, 0771, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};

        make_dir_with_options(options);

        auto result = make_dir_with_options(options);

        if (!result.ok()) {

            LOG(ERROR) << result.error();

        }

    }

    return {};

}



static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
@@ -1301,10 +1290,7 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) { 
    }



    if (!bootstrap) {

        auto create_dirs = create_apex_data_dirs();

        if (!create_dirs.ok()) {

            return create_dirs.error();

        }

        create_apex_data_dirs();

    }



    auto parse_result = ParseRcScriptsFromAllApexes(bootstrap);