Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5775147 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

Make StringPiece to be std::string_view alias 

Bug: 237583012
Test: build + boot + UTs

Change-Id: I849831f4466d3b9c7ec842b75256e7fcba77a0c0
parent 0eef7918

cmds/idmap2/include/idmap2/BinaryStreamVisitor.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class BinaryStreamVisitor : public Visitor { 
  void Write8(uint8_t value);

  void Write16(uint16_t value);

  void Write32(uint32_t value);

  void WriteString(const StringPiece& value);

  void WriteString(StringPiece value);

  std::ostream& stream_;

};

cmds/idmap2/libidmap2/BinaryStreamVisitor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void BinaryStreamVisitor::Write32(uint32_t value) { 
  stream_.write(reinterpret_cast<char*>(&x), sizeof(uint32_t));

}



void BinaryStreamVisitor::WriteString(const StringPiece& value) {

void BinaryStreamVisitor::WriteString(StringPiece value) {

  // pad with null to nearest word boundary;

  size_t padding_size = CalculatePadding(value.size());

  Write32(value.size());

cmds/idmap2/libidmap2/FabricatedOverlay.cpp

+9 −13
Original line number Diff line number Diff line
@@ -101,10 +101,10 @@ FabricatedOverlay::Builder& FabricatedOverlay::Builder::SetResourceValue( 
}



Result<FabricatedOverlay> FabricatedOverlay::Builder::Build() {

  using ConfigMap = std::map<std::string, TargetValue>;

  using EntryMap = std::map<std::string, ConfigMap>;

  using TypeMap = std::map<std::string, EntryMap>;

  using PackageMap = std::map<std::string, TypeMap>;

  using ConfigMap = std::map<std::string, TargetValue, std::less<>>;

  using EntryMap = std::map<std::string, ConfigMap, std::less<>>;

  using TypeMap = std::map<std::string, EntryMap, std::less<>>;

  using PackageMap = std::map<std::string, TypeMap, std::less<>>;

  PackageMap package_map;

  android::StringPool string_pool;

  for (const auto& res_entry : entries_) {
@@ -116,8 +116,7 @@ Result<FabricatedOverlay> FabricatedOverlay::Builder::Build() { 
      return Error("failed to parse resource name '%s'", res_entry.resource_name.c_str());

    }



    std::string package_name =

        package_substr.empty() ? target_package_name_ : package_substr.to_string();

    std::string_view package_name = package_substr.empty() ? target_package_name_ : package_substr;

    if (type_name.empty()) {

      return Error("resource name '%s' missing type name", res_entry.resource_name.c_str());

    }
@@ -133,17 +132,14 @@ Result<FabricatedOverlay> FabricatedOverlay::Builder::Build() { 
                    .first;

    }



    auto type = package->second.find(type_name.to_string());

    auto type = package->second.find(type_name);

    if (type == package->second.end()) {

      type =

          package->second

              .insert(std::make_pair(type_name.to_string(), EntryMap()))

              .first;

      type = package->second.insert(std::make_pair(type_name, EntryMap())).first;

    }



    auto entry = type->second.find(entry_name.to_string());

    auto entry = type->second.find(entry_name);

    if (entry == type->second.end()) {

      entry = type->second.insert(std::make_pair(entry_name.to_string(), ConfigMap())).first;

      entry = type->second.insert(std::make_pair(entry_name, ConfigMap())).first;

    }



    auto value = entry->second.find(res_entry.configuration);

cmds/idmap2/libidmap2/Idmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ Result<std::unique_ptr<const IdmapData>> IdmapData::FromResourceMapping( 
  }



  std::unique_ptr<IdmapData> data(new IdmapData());

  data->string_pool_data_ = resource_mapping.GetStringPoolData().to_string();

  data->string_pool_data_ = std::string(resource_mapping.GetStringPoolData());

  uint32_t inline_value_count = 0;

  std::set<std::string> config_set;

  for (const auto& mapping : resource_mapping.GetTargetToOverlayMap()) {

cmds/idmap2/libidmap2/PolicyUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ std::vector<std::string> BitmaskToPolicies(const PolicyBitmask& bitmask) { 


  for (const auto& policy : kPolicyStringToFlag) {

    if ((bitmask & policy.second) != 0) {

      policies.emplace_back(policy.first.to_string());

      policies.emplace_back(policy.first);

    }

  }