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

Commit 6e944a94 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Load *_compat_cil_file from system_ext as well" am: 3841fdfa 

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

Change-Id: I7e01eddc0ca726328ed6c0b310c93e237b7cf39e
parents 20be1caa 3841fdfa

init/selinux.cpp

+9 −0
Original line number Diff line number Diff line
@@ -372,6 +372,12 @@ bool OpenSplitPolicy(PolicyFile* policy_file) { 
        system_ext_mapping_file.clear();

    }



    std::string system_ext_compat_cil_file("/system_ext/etc/selinux/mapping/" + vend_plat_vers +

                                           ".compat.cil");

    if (access(system_ext_compat_cil_file.c_str(), F_OK) == -1) {

        system_ext_compat_cil_file.clear();

    }



    std::string product_policy_cil_file("/product/etc/selinux/product_sepolicy.cil");

    if (access(product_policy_cil_file.c_str(), F_OK) == -1) {

        product_policy_cil_file.clear();
@@ -426,6 +432,9 @@ bool OpenSplitPolicy(PolicyFile* policy_file) { 
    if (!system_ext_mapping_file.empty()) {

        compile_args.push_back(system_ext_mapping_file.c_str());

    }

    if (!system_ext_compat_cil_file.empty()) {

        compile_args.push_back(system_ext_compat_cil_file.c_str());

    }

    if (!product_policy_cil_file.empty()) {

        compile_args.push_back(product_policy_cil_file.c_str());

    }