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

Commit b82da1d8 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "init/selinux: renames nonplat_declaration.cil to... 

Merge "init/selinux: renames nonplat_declaration.cil to plat_pub_versioned.cil" am: d06a0c03 am: 43da9ee6
am: 3da0a4f6

Change-Id: I933300fce0048a3f1b7db262528e1df977806286
parents bd542030 3da0a4f6

init/selinux.cpp

+7 −7
Original line number Original line Diff line number Diff line
@@ -302,18 +302,18 @@ bool LoadSplitPolicy() { 
    }

    }

    std::string mapping_file("/system/etc/selinux/mapping/" + vend_plat_vers + ".cil");

    std::string mapping_file("/system/etc/selinux/mapping/" + vend_plat_vers + ".cil");





    // vendor_sepolicy.cil and nonplat_declaration.cil are the new design to replace

    // vendor_sepolicy.cil and plat_pub_versioned.cil are the new design to replace

    // nonplat_sepolicy.cil.

    // nonplat_sepolicy.cil.

    std::string nonplat_declaration_cil_file("/vendor/etc/selinux/nonplat_declaration.cil");

    std::string plat_pub_versioned_cil_file("/vendor/etc/selinux/plat_pub_versioned.cil");

    std::string vendor_policy_cil_file("/vendor/etc/selinux/vendor_sepolicy.cil");

    std::string vendor_policy_cil_file("/vendor/etc/selinux/vendor_sepolicy.cil");





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

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

        // For backward compatibility.

        // For backward compatibility.

        // TODO: remove this after no device is using nonplat_sepolicy.cil.

        // TODO: remove this after no device is using nonplat_sepolicy.cil.

        vendor_policy_cil_file = "/vendor/etc/selinux/nonplat_sepolicy.cil";

        vendor_policy_cil_file = "/vendor/etc/selinux/nonplat_sepolicy.cil";

        nonplat_declaration_cil_file.clear();

        plat_pub_versioned_cil_file.clear();

    } else if (access(nonplat_declaration_cil_file.c_str(), F_OK) == -1) {

    } else if (access(plat_pub_versioned_cil_file.c_str(), F_OK) == -1) {

        LOG(ERROR) << "Missing " << nonplat_declaration_cil_file;

        LOG(ERROR) << "Missing " << plat_pub_versioned_cil_file;

        return false;

        return false;

    }

    }
@@ -338,8 +338,8 @@ bool LoadSplitPolicy() { 
    };

    };

    // clang-format on

    // clang-format on





    if (!nonplat_declaration_cil_file.empty()) {

    if (!plat_pub_versioned_cil_file.empty()) {

        compile_args.push_back(nonplat_declaration_cil_file.c_str());

        compile_args.push_back(plat_pub_versioned_cil_file.c_str());

    }

    }

    if (!vendor_policy_cil_file.empty()) {

    if (!vendor_policy_cil_file.empty()) {

        compile_args.push_back(vendor_policy_cil_file.c_str());

        compile_args.push_back(vendor_policy_cil_file.c_str());