Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT2: Delete unused method parameter"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-20 18:33:06 +00:00
committed by Android (Google) Code Review
parent 61cd3214fb 2369f5407a
commit ade947448e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aapt2/link/TableMerger.cpp
View File

@@ -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

4
tools/aapt2/link/TableMerger.h
View File

@@ -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);