summaryrefslogtreecommitdiffstats
path: root/install/install.cpp
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2020-02-13 04:08:09 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-13 04:08:09 +0100
commit4139a30ec532d0f0cfcd73cd929d30dc74e98597 (patch)
tree3d8fd06b997afa96379dd4623f341abab218bdd5 /install/install.cpp
parentMerge "Force package installation with FUSE unless the package stores on device" into qt-qpr1-dev-plus-aosp (diff)
parentRevert "Force package installation with FUSE unless the package stores on device" (diff)
downloadandroid_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.gz
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.bz2
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.lz
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.xz
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.tar.zst
android_bootable_recovery-4139a30ec532d0f0cfcd73cd929d30dc74e98597.zip
Diffstat (limited to 'install/install.cpp')
-rw-r--r--install/install.cpp47
1 files changed, 0 insertions, 47 deletions
diff --git a/install/install.cpp b/install/install.cpp
index 1c9bf2fd2..4bb0903cc 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -30,7 +30,6 @@
#include <atomic>
#include <chrono>
#include <condition_variable>
-#include <filesystem>
#include <functional>
#include <limits>
#include <mutex>
@@ -642,49 +641,3 @@ bool verify_package(Package* package, RecoveryUI* ui) {
}
return true;
}
-
-bool SetupPackageMount(const std::string& package_path, bool* should_use_fuse) {
- CHECK(should_use_fuse != nullptr);
-
- if (package_path.empty()) {
- return false;
- }
-
- *should_use_fuse = true;
- if (package_path[0] == '@') {
- auto block_map_path = package_path.substr(1);
- if (ensure_path_mounted(block_map_path) != 0) {
- LOG(ERROR) << "Failed to mount " << block_map_path;
- return false;
- }
- // uncrypt only produces block map only if the package stays on /data.
- *should_use_fuse = false;
- return true;
- }
-
- // Package is not a block map file.
- if (ensure_path_mounted(package_path) != 0) {
- LOG(ERROR) << "Failed to mount " << package_path;
- return false;
- }
-
- // Reject the package if the input path doesn't equal the canonicalized path.
- // e.g. /cache/../sdcard/update_package.
- std::error_code ec;
- auto canonical_path = std::filesystem::canonical(package_path, ec);
- if (ec) {
- LOG(ERROR) << "Failed to get canonical of " << package_path << ", " << ec.message();
- return false;
- }
- if (canonical_path.string() != package_path) {
- LOG(ERROR) << "Installation aborts. The canonical path " << canonical_path.string()
- << " doesn't equal the original path " << package_path;
- return false;
- }
-
- constexpr const char* CACHE_ROOT = "/cache";
- if (android::base::StartsWith(package_path, CACHE_ROOT)) {
- *should_use_fuse = false;
- }
- return true;
-}