ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support vendor partition in non-debuggable pVMs" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-09-23 20:27:15 +00:00 • committed by Gerrit Code Review
commit 23903e1655
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/first_stage_mount.cpp
View file

@ -156,6 +156,13 @@ static Result<Fstab> ReadFirstStageFstabAndroid() {
return fstab; return fstab;
} }
static bool IsRequestingMicrodroidVendorPartition(const std::string& cmdline) {
if (virtualization::IsEnableTpuAssignableDeviceFlagEnabled()) {
return access("/proc/device-tree/avf/vendor_hashtree_descriptor_root_digest", F_OK) == 0;
}
return cmdline.find("androidboot.microdroid.mount_vendor=1") != std::string::npos;
}
// Note: this is a temporary solution to avoid blocking devs that depend on /vendor partition in // Note: this is a temporary solution to avoid blocking devs that depend on /vendor partition in
// Microdroid. For the proper solution the /vendor fstab should probably be defined in the DT. // Microdroid. For the proper solution the /vendor fstab should probably be defined in the DT.
// TODO(b/285855430): refactor this // TODO(b/285855430): refactor this
@ -166,7 +173,7 @@ static Result<Fstab> ReadFirstStageFstabMicrodroid(const std::string& cmdline) {
if (!ReadDefaultFstab(&fstab)) { if (!ReadDefaultFstab(&fstab)) {
return Error() << "failed to read fstab"; return Error() << "failed to read fstab";
} }
if (cmdline.find("androidboot.microdroid.mount_vendor=1") == std::string::npos) { if (!IsRequestingMicrodroidVendorPartition(cmdline)) {
// We weren't asked to mount /vendor partition, filter it out from the fstab. // We weren't asked to mount /vendor partition, filter it out from the fstab.
auto predicate = [](const auto& entry) { return entry.mount_point == "/vendor"; }; auto predicate = [](const auto& entry) { return entry.mount_point == "/vendor"; };
fstab.erase(std::remove_if(fstab.begin(), fstab.end(), predicate), fstab.end()); fstab.erase(std::remove_if(fstab.begin(), fstab.end(), predicate), fstab.end());