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

Commit ade94744 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Delete unused method parameter"

parents 61cd3214 2369f540

tools/aapt2/link/TableMerger.cpp

+5 −7
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ bool TableMerger::MergeImpl(const Source& src, ResourceTable* table, bool overla 
      // valid. This is because un-mangled references are mangled, then looked up at resolution

      // time. Also, when linking, we convert references with no package name to use the compilation

      // package name.

      error |= !DoMerge(src, table, package.get(), false /*mangle*/, overlay, allow_new);

      error |= !DoMerge(src, package.get(), false /*mangle*/, overlay, allow_new);

    }

  }

  return !error;
@@ -78,7 +78,7 @@ bool TableMerger::MergeAndMangle(const Source& src, const StringPiece& package_n 


    bool mangle = package_name != context_->GetCompilationPackage();

    merged_packages_.insert(package->name);

    error |= !DoMerge(src, table, package.get(), mangle, false /*overlay*/, true /*allow_new*/);

    error |= !DoMerge(src, package.get(), mangle, false /*overlay*/, true /*allow_new*/);

  }

  return !error;

}
@@ -213,9 +213,8 @@ static ResourceTable::CollisionResult MergeConfigValue(IAaptContext* context, 
  return collision_result;

}



bool TableMerger::DoMerge(const Source& src, ResourceTable* src_table,

                          ResourceTablePackage* src_package, bool mangle_package, bool overlay,

                          bool allow_new_resources) {

bool TableMerger::DoMerge(const Source& src, ResourceTablePackage* src_package, bool mangle_package,

                          bool overlay, bool allow_new_resources) {

  bool error = false;



  for (auto& src_type : src_package->types) {
@@ -337,8 +336,7 @@ bool TableMerger::MergeFile(const ResourceFile& file_desc, bool overlay, io::IFi 
      ->FindOrCreateValue(file_desc.config, {})

      ->value = std::move(file_ref);



  return DoMerge(file->GetSource(), &table, pkg, false /*mangle*/, overlay /*overlay*/,

                 true /*allow_new*/);

  return DoMerge(file->GetSource(), pkg, false /*mangle*/, overlay /*overlay*/, true /*allow_new*/);

}



}  // namespace aapt

tools/aapt2/link/TableMerger.h

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ class TableMerger { 


  bool MergeImpl(const Source& src, ResourceTable* src_table, bool overlay, bool allow_new);



  bool DoMerge(const Source& src, ResourceTable* src_table, ResourceTablePackage* src_package,

               bool mangle_package, bool overlay, bool allow_new_resources);

  bool DoMerge(const Source& src, ResourceTablePackage* src_package, bool mangle_package,

               bool overlay, bool allow_new_resources);



  std::unique_ptr<FileReference> CloneAndMangleFile(const std::string& package,

                                                    const FileReference& value);