Snap for 12695596 from 13c2add89c76b4859a66b2e515e18f2801e158cc to 25Q1-release
Change-Id: I5827198c5b14740c115704c21e05b97ea8b1d957
diff --git a/init/Android.bp b/init/Android.bp
index 4025a6b..4ee3be2 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -176,6 +176,7 @@
"libxml2",
"lib_apex_manifest_proto_lite",
"update_metadata-protos",
+ "libgenfslabelsversion.ffi",
],
shared_libs: [
"libbase",
diff --git a/init/selinux.cpp b/init/selinux.cpp
index 5ced0b8..6316b4d 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -69,6 +69,7 @@
#include <android/avf_cc_flags.h>
#include <fs_avb/fs_avb.h>
#include <fs_mgr.h>
+#include <genfslabelsversion.h>
#include <libgsi/libgsi.h>
#include <libsnapshot/snapshot.h>
#include <selinux/android.h>
@@ -190,22 +191,6 @@
return true;
}
-int GetVendorGenfsVersion() {
- std::string line;
- if (!ReadFirstLine("/vendor/etc/selinux/genfs_labels_version.txt", &line)) {
- PLOG(ERROR) << "Failed to read /vendor/etc/selinux/genfs_labels_version.txt; assuming it's "
- "202404";
- return 202404;
- }
- int version;
- if (!ParseInt(line, &version)) {
- PLOG(ERROR) << "Failed to parse the genfs labels version " << line
- << "; assuming it's 202404";
- return 202404;
- }
- return version;
-}
-
constexpr const char plat_policy_cil_file[] = "/system/etc/selinux/plat_sepolicy.cil";
bool IsSplitPolicyDevice() {
@@ -342,11 +327,14 @@
std::vector<std::string> genfs_cil_files;
- int vendor_genfs_version = GetVendorGenfsVersion();
+ int vendor_genfs_version = get_genfs_labels_version();
std::string genfs_cil_file =
std::format("/system/etc/selinux/plat_sepolicy_genfs_{}.cil", vendor_genfs_version);
if (access(genfs_cil_file.c_str(), F_OK) != 0) {
+ LOG(INFO) << "Missing " << genfs_cil_file << "; skipping";
genfs_cil_file.clear();
+ } else {
+ LOG(INFO) << "Using " << genfs_cil_file << " for genfs labels";
}
// clang-format off
diff --git a/rootdir/init.rc b/rootdir/init.rc
index eeafd4c..8ffac20 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -596,6 +596,7 @@
mkdir /metadata/ota/snapshots 0750 root system
mkdir /metadata/watchdog 0770 root system
mkdir /metadata/tradeinmode 0770 root system
+ mkdir /metadata/prefetch 0770 root system
mkdir /metadata/apex 0700 root system
mkdir /metadata/apex/sessions 0700 root system