diff options
Diffstat (limited to 'host/commands/assemble_cvd/misc_info.cc')
| -rw-r--r-- | host/commands/assemble_cvd/misc_info.cc | 225 |
1 files changed, 56 insertions, 169 deletions
diff --git a/host/commands/assemble_cvd/misc_info.cc b/host/commands/assemble_cvd/misc_info.cc index 834cf7389..292258b96 100644 --- a/host/commands/assemble_cvd/misc_info.cc +++ b/host/commands/assemble_cvd/misc_info.cc @@ -15,20 +15,14 @@ #include "misc_info.h" -#include <array> -#include <memory> -#include <set> +#include <algorithm> #include <string> -#include <unordered_set> #include <vector> #include <android-base/logging.h> -#include <android-base/parseint.h> +#include <android-base/stringprintf.h> #include <android-base/strings.h> -#include <fmt/format.h> -#include "common/libs/fs/shared_buf.h" -#include "common/libs/fs/shared_fd.h" #include "common/libs/utils/contains.h" #include "common/libs/utils/result.h" @@ -37,75 +31,7 @@ namespace { constexpr char kDynamicPartitions[] = "dynamic_partition_list"; constexpr char kGoogleDynamicPartitions[] = "google_dynamic_partitions"; -constexpr char kRollbackIndexSuffix[] = "_rollback_index_location"; -constexpr char kSuperBlockDevices[] = "super_block_devices"; constexpr char kSuperPartitionGroups[] = "super_partition_groups"; -constexpr char kUseDynamicPartitions[] = "use_dynamic_partitions"; -constexpr std::array kNonPartitionKeysToMerge = { - "ab_update", "default_system_dev_certificate"}; - -Result<std::string> GetExpected(const MiscInfo& misc_info, - const std::string& key) { - auto lookup = misc_info.find(key); - CF_EXPECTF(lookup != misc_info.end(), - "Unable to retrieve expected value from key: {}", key); - return lookup->second; -} - -std::string GetOrDefault(const MiscInfo& misc_info, const std::string& key, - const std::string& default_value) { - auto result = GetExpected(misc_info, key); - return result.ok() ? *result : default_value; -} - -std::string MergePartitionLists(const std::string& vendor, - const std::string& system) { - const std::string full_string = fmt::format("{} {}", vendor, system); - auto full_list = android::base::Tokenize(full_string, " "); - // std::set removes duplicates and orders the elements, which we want - std::set<std::string> full_set(full_list.begin(), full_list.end()); - return android::base::Join(full_set, " "); -} - -std::string GetPartitionList(const MiscInfo& vendor_info, - const MiscInfo& system_info, - const std::string& key) { - std::string vendor_list = GetOrDefault(vendor_info, key, ""); - std::string system_list = GetOrDefault(system_info, key, ""); - return MergePartitionLists(vendor_list, system_list); -} - -std::vector<std::string> GeneratePartitionKeys(const std::string& name) { - std::vector<std::string> result; - result.emplace_back("avb_" + name); - result.emplace_back("avb_" + name + "_algorithm"); - result.emplace_back("avb_" + name + "_key_path"); - result.emplace_back("avb_" + name + kRollbackIndexSuffix); - result.emplace_back("avb_" + name + "_hashtree_enable"); - result.emplace_back("avb_" + name + "_add_hashtree_footer_args"); - result.emplace_back(name + "_disable_sparse"); - result.emplace_back("building_" + name + "_image"); - auto fs_type_key = name + "_fs_type"; - if (name == "system") { - fs_type_key = "fs_type"; - } - result.emplace_back(fs_type_key); - return result; -} - -Result<int> ResolveRollbackIndexConflicts( - const std::string& index_string, - const std::unordered_set<int> used_indices) { - int index; - CF_EXPECTF(android::base::ParseInt(index_string, &index), - "Unable to parse value {} to string. Maybe a wrong or bad value " - "read for the rollback index?", - index_string); - while (Contains(used_indices, index)) { - ++index; - } - return index; -} } // namespace @@ -135,112 +61,73 @@ Result<MiscInfo> ParseMiscInfo(const std::string& misc_info_contents) { return misc_info; } -Result<void> WriteMiscInfo(const MiscInfo& misc_info, - const std::string& output_path) { - std::stringstream file_content; +std::string WriteMiscInfo(const MiscInfo& misc_info) { + std::stringstream out; for (const auto& entry : misc_info) { - file_content << entry.first << "=" << entry.second << "\n"; + out << entry.first << "=" << entry.second << "\n"; } - - SharedFD output_file = SharedFD::Creat(output_path.c_str(), 0644); - CF_EXPECT(output_file->IsOpen(), - "Failed to open output misc file: " << output_file->StrError()); - - CF_EXPECT( - WriteAll(output_file, file_content.str()) >= 0, - "Failed to write output misc file contents: " << output_file->StrError()); - return {}; + return out.str(); } -// based on build/make/tools/releasetools/merge/merge_target_files.py -Result<MiscInfo> GetCombinedDynamicPartitions(const MiscInfo& vendor_info, - const MiscInfo& system_info) { - CF_EXPECTF(CF_EXPECT(GetExpected(vendor_info, kDynamicPartitions)) == "true", - "Vendor build must have {}=true", kUseDynamicPartitions); - CF_EXPECTF(CF_EXPECT(GetExpected(system_info, kDynamicPartitions)) == "true", - "System build must have {}=true", kUseDynamicPartitions); - MiscInfo result; - // copy where both files are equal - for (const auto& key_val : vendor_info) { - const auto value_result = GetExpected(system_info, key_val.first); - if (value_result.ok() && *value_result == key_val.second) { - result[key_val.first] = key_val.second; - } - } - - result[kDynamicPartitions] = - GetPartitionList(vendor_info, system_info, kDynamicPartitions); - - const auto block_devices_result = - GetExpected(vendor_info, kSuperBlockDevices); - if (block_devices_result.ok()) { - result[kSuperBlockDevices] = *block_devices_result; - for (const auto& block_device : - android::base::Tokenize(result[kSuperBlockDevices], " ")) { - const auto key = "super_" + block_device + "_device_size"; - result[key] = CF_EXPECT(GetExpected(vendor_info, key)); - } +std::vector<std::string> SuperPartitionComponents(const MiscInfo& info) { + auto value_it = info.find(kDynamicPartitions); + if (value_it == info.end()) { + return {}; } - - result[kSuperPartitionGroups] = - CF_EXPECT(GetExpected(vendor_info, kSuperPartitionGroups)); - for (const auto& group : - android::base::Tokenize(result[kSuperPartitionGroups], " ")) { - const auto group_size_key = "super_" + group + "_group_size"; - result[group_size_key] = - CF_EXPECT(GetExpected(vendor_info, group_size_key)); - - const auto partition_list_key = "super_" + group + "_partition_list"; - result[partition_list_key] = - GetPartitionList(vendor_info, system_info, partition_list_key); + auto components = android::base::Split(value_it->second, " "); + for (auto& component : components) { + component = android::base::Trim(component); } + components.erase(std::remove(components.begin(), components.end(), ""), + components.end()); + return components; +} - // TODO(chadreynolds): add vabc_cow_version logic if we need to support older - // builds - for (const auto& key : - {"virtual_ab", "virtual_ab_retrofit", "lpmake", "super_metadata_device", - "super_partition_error_limit", "super_partition_size"}) { - const auto value_result = GetExpected(vendor_info, key); - if (value_result.ok()) { - result[key] = *value_result; - } +bool SetSuperPartitionComponents(const std::vector<std::string>& components, + MiscInfo* misc_info) { + auto super_partition_groups = misc_info->find(kSuperPartitionGroups); + if (super_partition_groups == misc_info->end()) { + LOG(ERROR) << "Failed to find super partition groups in misc_info"; + return false; } - return std::move(result); -} -Result<MiscInfo> MergeMiscInfos( - const MiscInfo& vendor_info, const MiscInfo& system_info, - const MiscInfo& combined_dp_info, - const std::vector<std::string>& system_partitions) { - // the combined misc info uses the vendor values as defaults - MiscInfo result = vendor_info; - std::unordered_set<int> used_indices; - for (const auto& partition : system_partitions) { - for (const auto& key : GeneratePartitionKeys(partition)) { - if (!Contains(system_info, key)) { - continue; - } - auto system_value = system_info.find(key)->second; - // avb_<partition>_rollback_index_location values can conflict across - // different builds - if (android::base::EndsWith(key, kRollbackIndexSuffix)) { - const auto index = CF_EXPECT( - ResolveRollbackIndexConflicts(system_value, used_indices)); - used_indices.insert(index); - system_value = std::to_string(index); + // Remove all existing update groups in misc_info + auto update_groups = + android::base::Split(super_partition_groups->second, " "); + for (const auto& group_name : update_groups) { + auto partition_list = android::base::StringPrintf("super_%s_partition_list", + group_name.c_str()); + auto partition_size = + android::base::StringPrintf("super_%s_group_size", group_name.c_str()); + for (const auto& key : {partition_list, partition_size}) { + auto it = misc_info->find(key); + if (it == misc_info->end()) { + LOG(ERROR) << "Failed to find " << key << " in misc_info"; + return false; } - result[key] = system_value; + misc_info->erase(it); } } - for (const auto& key : kNonPartitionKeysToMerge) { - if (Contains(system_info, key)) { - result[key] = system_info.find(key)->second; - } - } - for (const auto& key_val : combined_dp_info) { - result[key_val.first] = key_val.second; + + // For merged target-file, put all dynamic partitions under the + // google_dynamic_partitions update group. + // TODO(xunchang) use different update groups for system and vendor images. + (*misc_info)[kDynamicPartitions] = android::base::Join(components, " "); + (*misc_info)[kSuperPartitionGroups] = kGoogleDynamicPartitions; + std::string partitions_list_key = android::base::StringPrintf( + "super_%s_partition_list", kGoogleDynamicPartitions); + (*misc_info)[partitions_list_key] = android::base::Join(components, " "); + + // Use the entire super partition as the group size + std::string group_size_key = android::base::StringPrintf( + "super_%s_group_size", kGoogleDynamicPartitions); + auto super_size_it = misc_info->find("super_partition_size"); + if (super_size_it == misc_info->end()) { + LOG(ERROR) << "Failed to find super partition size"; + return false; } - return std::move(result); + (*misc_info)[group_size_key] = super_size_it->second; + return true; } } // namespace cuttlefish |