Remove unused code in delta_generator
LoadSettings() is inherited from chrome os code base, where
delta_generator will read /etc/update_engine.conf on input image to
determine update_engine's version number. However, we never added
update_engine.conf to platform build artifacts, so this code path is
useless on aosp. In addition, ota_from_target_files always specify a
minor version, so we do not need this code path.
Test: th
Bug: 281960439
Change-Id: Ia00459bdebc91c37960f071c71f86c58004728af
diff --git a/payload_generator/deflate_utils.cc b/payload_generator/deflate_utils.cc
index 30e3f67..cc2e4d6 100644
--- a/payload_generator/deflate_utils.cc
+++ b/payload_generator/deflate_utils.cc
@@ -27,7 +27,6 @@
#include "update_engine/common/utils.h"
#include "update_engine/payload_generator/delta_diff_generator.h"
#include "update_engine/payload_generator/extent_ranges.h"
-#include "update_engine/payload_generator/extent_utils.h"
#include "update_engine/payload_generator/squashfs_filesystem.h"
#include "update_engine/update_metadata.pb.h"
@@ -316,9 +315,8 @@
TEST_AND_RETURN_FALSE(
CopyExtentsToFile(part.path, file.extents, path.value(), kBlockSize));
// Test if it is actually a Squashfs file.
- auto sqfs = SquashfsFilesystem::CreateFromFile(path.value(),
- extract_deflates,
- /*load_settings=*/false);
+ auto sqfs =
+ SquashfsFilesystem::CreateFromFile(path.value(), extract_deflates);
if (sqfs) {
// It is an squashfs file. Get its files to replace with itself.
vector<FilesystemInterface::File> files;