Merge "Load *_compat_cil_file from system_ext as well" (3841fdfa) · Commits · e / os / android_system_core

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());
		}