Revert "Force package installation with FUSE unless the package stores on device"

This reverts commit 5e6c4e9a91.

Reason for revert: BUG: 149432069 - build failure on git_qt-qpr1-dev-plus-aosp on docs. 'otautil/roots.h' file not found is the error.
Forrest run: https://android-build.googleplex.com/builds/forrest/run/L85900000460577420

Change-Id: I35119c2334895aa0ef4ed71b3ddd08f280c0c031
Merged-In: I35119c2334895aa0ef4ed71b3ddd08f280c0c031
This commit is contained in:
Raman Tenneti
2020-02-13 03:03:36 +00:00
parent 5e6c4e9a91
commit daaacea96e
6 changed files with 1 additions and 87 deletions
-28
View File
@@ -34,7 +34,6 @@
#include "install/install.h"
#include "install/wipe_device.h"
#include "otautil/paths.h"
#include "otautil/roots.h"
#include "private/setup_commands.h"
static void BuildZipArchive(const std::map<std::string, std::string>& file_map, int fd,
@@ -514,30 +513,3 @@ TEST(InstallTest, CheckPackageMetadata_ab_post_timestamp) {
"\n");
TestCheckPackageMetadata(metadata, OtaType::AB, true);
}
TEST(InstallTest, SetupPackageMount_package_path) {
load_volume_table();
bool install_with_fuse;
// Setup should fail if the input path doesn't exist.
ASSERT_FALSE(SetupPackageMount("/does_not_exist", &install_with_fuse));
// Package should be installed with fuse if it's not in /cache.
TemporaryDir temp_dir;
TemporaryFile update_package(temp_dir.path);
ASSERT_TRUE(SetupPackageMount(update_package.path, &install_with_fuse));
ASSERT_TRUE(install_with_fuse);
// Setup should fail if the input path isn't canonicalized.
std::string uncanonical_package_path = android::base::Join(
std::vector<std::string>{
temp_dir.path,
"..",
android::base::Basename(temp_dir.path),
android::base::Basename(update_package.path),
},
'/');
ASSERT_EQ(0, access(uncanonical_package_path.c_str(), R_OK));
ASSERT_FALSE(SetupPackageMount(uncanonical_package_path, &install_with_fuse));
}