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/squashfs_filesystem.h b/payload_generator/squashfs_filesystem.h
index 5045dfc..e1b6f69 100644
--- a/payload_generator/squashfs_filesystem.h
+++ b/payload_generator/squashfs_filesystem.h
@@ -30,8 +30,6 @@
#include <brillo/secure_blob.h>
-#include "update_engine/payload_consumer/file_descriptor.h"
-#include "update_engine/payload_generator/extent_utils.h"
#include "update_engine/payload_generator/filesystem_interface.h"
namespace chromeos_update_engine {
@@ -59,7 +57,7 @@
// |extract_deflates| is true, it will process files to find location of all
// deflate streams.
static std::unique_ptr<SquashfsFilesystem> CreateFromFile(
- const std::string& sqfs_path, bool extract_deflates, bool load_settings);
+ const std::string& sqfs_path, bool extract_deflates);
// Creates the file system from a file map |filemap| which is a multi-line
// string with each line with the following format:
@@ -89,9 +87,6 @@
// one for the metadata at the end.
bool GetFiles(std::vector<File>* files) const override;
- // Squashfs image does not support this yet.
- bool LoadSettings(brillo::KeyValueStore* store) const override;
-
// Returns true if the first few bytes of a file indicates a valid Squashfs
// image. The size of the |blob| should be at least
// sizeof(SquashfsHeader) or for now 96 bytes.
@@ -108,14 +103,11 @@
bool extract_deflates);
// The size of the image in bytes.
- size_t size_;
+ size_t size_{};
// All the files in the filesystem.
std::vector<File> files_;
- // The content of /etc/update_engine.conf.
- std::string update_engine_config_;
-
DISALLOW_COPY_AND_ASSIGN(SquashfsFilesystem);
};