Restore applypatch/updater/edify for non-A/B OTA support
Google deleted this source from bootable/recovery outright (commit c7ebad5f, "rm -rf non-AB code", 2024-04-05) — confirmed present at android-14, absent at android-16.0.0_r4. The runtime side (install.cpp's SetUpNonAbUpdateCommands) and build-side packaging (ota_from_target_files.py's GenerateNonAbOtaPackage) both survived; only the source that builds the update-binary executable itself was removed. Sourced from TeamWin's android_bootable_recovery (android-14.1), the only living copy found, with install/ZipUtil.cpp, get_args.cpp, and set_metadata.cpp intentionally left out (only wired into TeamWin's modified install.cpp, which PawletOS isn't adopting — twrpinstall carries its own independent copies). Kept as its own repo, not folded into a recovery fork, so it's buildable independent of whichever recovery UI ends up in use.
This commit is contained in:
@@ -0,0 +1,82 @@
|
||||
/*
|
||||
* Copyright (C) 2007 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "mounts.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <mntent.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/mount.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <android-base/logging.h>
|
||||
|
||||
struct MountedVolume {
|
||||
std::string device;
|
||||
std::string mount_point;
|
||||
std::string filesystem;
|
||||
std::string flags;
|
||||
};
|
||||
|
||||
static std::vector<MountedVolume*> g_mounts_state;
|
||||
|
||||
bool scan_mounted_volumes() {
|
||||
for (size_t i = 0; i < g_mounts_state.size(); ++i) {
|
||||
delete g_mounts_state[i];
|
||||
}
|
||||
g_mounts_state.clear();
|
||||
|
||||
// Open and read mount table entries.
|
||||
FILE* fp = setmntent("/proc/mounts", "re");
|
||||
if (fp == NULL) {
|
||||
return false;
|
||||
}
|
||||
mntent* e;
|
||||
while ((e = getmntent(fp)) != NULL) {
|
||||
MountedVolume* v = new MountedVolume;
|
||||
v->device = e->mnt_fsname;
|
||||
v->mount_point = e->mnt_dir;
|
||||
v->filesystem = e->mnt_type;
|
||||
v->flags = e->mnt_opts;
|
||||
g_mounts_state.push_back(v);
|
||||
}
|
||||
endmntent(fp);
|
||||
return true;
|
||||
}
|
||||
|
||||
MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) {
|
||||
for (size_t i = 0; i < g_mounts_state.size(); ++i) {
|
||||
if (g_mounts_state[i]->mount_point == mount_point) return g_mounts_state[i];
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
int unmount_mounted_volume(MountedVolume* volume) {
|
||||
// Intentionally pass the empty string to umount if the caller tries to unmount a volume they
|
||||
// already unmounted using this function.
|
||||
std::string mount_point = volume->mount_point;
|
||||
volume->mount_point.clear();
|
||||
int result = umount(mount_point.c_str());
|
||||
if (result == -1) {
|
||||
PLOG(WARNING) << "Failed to umount " << mount_point;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
Reference in New Issue
Block a user