diff options
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | fuse_sideload/fuse_sideload.cpp | 2 | ||||
-rw-r--r-- | minui/Android.bp | 12 | ||||
-rw-r--r-- | recovery_utils/roots.cpp | 20 | ||||
-rw-r--r-- | update_verifier/care_map_generator.py | 4 |
5 files changed, 19 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk index 4a730b585..8ef4830f4 100644 --- a/Android.mk +++ b/Android.mk @@ -64,6 +64,7 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) LOCAL_REQUIRED_MODULES += \ make_f2fs.recovery \ + fsck.f2fs.recovery \ sload_f2fs.recovery endif diff --git a/fuse_sideload/fuse_sideload.cpp b/fuse_sideload/fuse_sideload.cpp index 3d9480309..07cbe96f3 100644 --- a/fuse_sideload/fuse_sideload.cpp +++ b/fuse_sideload/fuse_sideload.cpp @@ -225,7 +225,7 @@ static int handle_release(void* /* data */, fuse_data* /* fd */, const fuse_in_h // Fetch a block from the host into fd->curr_block and fd->block_data. // Returns 0 on successful fetch, negative otherwise. -static int fetch_block(fuse_data* fd, uint32_t block) { +static int fetch_block(fuse_data* fd, uint64_t block) { if (block == fd->curr_block) { return 0; } diff --git a/minui/Android.bp b/minui/Android.bp index f68f6c81d..02fb3638f 100644 --- a/minui/Android.bp +++ b/minui/Android.bp @@ -24,6 +24,7 @@ package { cc_library { name: "libminui", recovery_available: true, + vendor_available: true, defaults: [ "recovery_defaults", @@ -51,4 +52,15 @@ cc_library { "libpng", "libz", ], + + target: { + vendor: { + exclude_static_libs: [ + "libsync", + ], + shared_libs: [ + "libsync", + ], + }, + }, } diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp index 19484478c..0b82c1ccd 100644 --- a/recovery_utils/roots.cpp +++ b/recovery_utils/roots.cpp @@ -33,8 +33,7 @@ #include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/unique_fd.h> -#include <cryptfs.h> -#include <ext4_utils/wipe.h> +#include <ext4_utils/ext4_utils.h> #include <fs_mgr.h> #include <fs_mgr/roots.h> @@ -161,29 +160,16 @@ int format_volume(const std::string& volume, const std::string& directory) { needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false); } - // If there's a key_loc that looks like a path, it should be a block device for storing encryption - // metadata. Wipe it too. - if (!v->key_loc.empty() && v->key_loc[0] == '/') { - LOG(INFO) << "Wiping " << v->key_loc; - int fd = open(v->key_loc.c_str(), O_WRONLY | O_CREAT, 0644); - if (fd == -1) { - PLOG(ERROR) << "format_volume: Failed to open " << v->key_loc; - return -1; - } - wipe_block_device(fd, get_file_size(fd)); - close(fd); - } - int64_t length = 0; if (v->length > 0) { length = v->length; - } else if (v->length < 0 || v->key_loc == "footer") { + } else if (v->length < 0) { android::base::unique_fd fd(open(v->blk_device.c_str(), O_RDONLY)); if (fd == -1) { PLOG(ERROR) << "format_volume: failed to open " << v->blk_device; return -1; } - length = get_file_size(fd.get(), v->length ? -v->length : CRYPT_FOOTER_OFFSET); + length = get_file_size(fd.get(), -v->length); if (length <= 0) { LOG(ERROR) << "get_file_size: invalid size " << length << " for " << v->blk_device; return -1; diff --git a/update_verifier/care_map_generator.py b/update_verifier/care_map_generator.py index c6f2dad24..b1396a43c 100644 --- a/update_verifier/care_map_generator.py +++ b/update_verifier/care_map_generator.py @@ -111,14 +111,14 @@ def main(argv): logging.basicConfig(level=logging.INFO if args.verbose else logging.WARNING, format=logging_format) - with open(args.input_care_map, 'r') as input_care_map: + with open(args.input_care_map, 'rb') as input_care_map: content = input_care_map.read() if args.parse_proto: result = ParseProtoMessage(content, args.fingerprint_enabled).encode() else: care_map_proto = GenerateCareMapProtoFromLegacyFormat( - content.rstrip().splitlines(), args.fingerprint_enabled) + content.decode().rstrip().splitlines(), args.fingerprint_enabled) result = care_map_proto.SerializeToString() with open(args.output_file, 'wb') as output: |