blob: 10e837c725e5ce605cc5e8744574e462270a3dd9 [file] [log] [blame]
Adam Lesinski1ab598f2015-08-14 14:26:04 -07001/*
2 * Copyright (C) 2015 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
Adam Lesinskicacb28f2016-10-19 12:18:14 -070017#include "link/TableMerger.h"
Adam Lesinskice5e56e2016-10-21 17:56:45 -070018
19#include "android-base/logging.h"
20
Adam Lesinski1ab598f2015-08-14 14:26:04 -070021#include "ResourceTable.h"
Adam Lesinskia6fe3452015-12-09 15:20:52 -080022#include "ResourceUtils.h"
Adam Lesinski1ab598f2015-08-14 14:26:04 -070023#include "ResourceValues.h"
24#include "ValueVisitor.h"
Adam Lesinski1ab598f2015-08-14 14:26:04 -070025#include "util/Util.h"
26
Adam Lesinskid5083f62017-01-16 15:07:21 -080027using android::StringPiece;
28
Adam Lesinski1ab598f2015-08-14 14:26:04 -070029namespace aapt {
30
Adam Lesinskice5e56e2016-10-21 17:56:45 -070031TableMerger::TableMerger(IAaptContext* context, ResourceTable* out_table,
Adam Lesinskicacb28f2016-10-19 12:18:14 -070032 const TableMergerOptions& options)
Adam Lesinskice5e56e2016-10-21 17:56:45 -070033 : context_(context), master_table_(out_table), options_(options) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070034 // Create the desired package that all tables will be merged into.
Adam Lesinskice5e56e2016-10-21 17:56:45 -070035 master_package_ = master_table_->CreatePackage(
36 context_->GetCompilationPackage(), context_->GetPackageId());
37 CHECK(master_package_ != nullptr) << "package name or ID already taken";
Adam Lesinski1ab598f2015-08-14 14:26:04 -070038}
39
Adam Lesinskice5e56e2016-10-21 17:56:45 -070040bool TableMerger::Merge(const Source& src, ResourceTable* table,
Adam Lesinski64587af2016-02-18 18:33:06 -080041 io::IFileCollection* collection) {
Adam Lesinskib5dc4bd2017-02-22 19:29:29 -080042 return MergeImpl(src, table, collection, false /* overlay */, true /* allow new */);
Adam Lesinski64587af2016-02-18 18:33:06 -080043}
44
Adam Lesinskice5e56e2016-10-21 17:56:45 -070045bool TableMerger::MergeOverlay(const Source& src, ResourceTable* table,
Adam Lesinski64587af2016-02-18 18:33:06 -080046 io::IFileCollection* collection) {
Adam Lesinskib5dc4bd2017-02-22 19:29:29 -080047 return MergeImpl(src, table, collection, true /* overlay */, options_.auto_add_overlay);
Adam Lesinski64587af2016-02-18 18:33:06 -080048}
49
Adam Lesinski83f22552015-11-07 11:51:23 -080050/**
51 * This will merge packages with the same package name (or no package name).
52 */
Adam Lesinskice5e56e2016-10-21 17:56:45 -070053bool TableMerger::MergeImpl(const Source& src, ResourceTable* table,
Adam Lesinskicacb28f2016-10-19 12:18:14 -070054 io::IFileCollection* collection, bool overlay,
Adam Lesinskice5e56e2016-10-21 17:56:45 -070055 bool allow_new) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070056 bool error = false;
57 for (auto& package : table->packages) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070058 // Only merge an empty package or the package we're building.
59 // Other packages may exist, which likely contain attribute definitions.
60 // This is because at compile time it is unknown if the attributes are
Adam Lesinskib5dc4bd2017-02-22 19:29:29 -080061 // simply uses of the attribute or definitions.
62 if (package->name.empty() || context_->GetCompilationPackage() == package->name) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070063 FileMergeCallback callback;
64 if (collection) {
65 callback = [&](const ResourceNameRef& name,
Adam Lesinskice5e56e2016-10-21 17:56:45 -070066 const ConfigDescription& config, FileReference* new_file,
67 FileReference* old_file) -> bool {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070068 // The old file's path points inside the APK, so we can use it as is.
Adam Lesinskice5e56e2016-10-21 17:56:45 -070069 io::IFile* f = collection->FindFile(*old_file->path);
Adam Lesinskicacb28f2016-10-19 12:18:14 -070070 if (!f) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -070071 context_->GetDiagnostics()->Error(DiagMessage(src)
Adam Lesinskib5dc4bd2017-02-22 19:29:29 -080072 << "file '" << *old_file->path << "' not found");
Adam Lesinskicacb28f2016-10-19 12:18:14 -070073 return false;
74 }
75
Adam Lesinskice5e56e2016-10-21 17:56:45 -070076 new_file->file = f;
Adam Lesinskicacb28f2016-10-19 12:18:14 -070077 return true;
78 };
79 }
80
81 // Merge here. Once the entries are merged and mangled, any references to
82 // them are still valid. This is because un-mangled references are
83 // mangled, then looked up at resolution time.
84 // Also, when linking, we convert references with no package name to use
85 // the compilation package name.
Adam Lesinskice5e56e2016-10-21 17:56:45 -070086 error |= !DoMerge(src, table, package.get(), false /* mangle */, overlay,
87 allow_new, callback);
Adam Lesinskicacb28f2016-10-19 12:18:14 -070088 }
89 }
90 return !error;
Adam Lesinski83f22552015-11-07 11:51:23 -080091}
92
93/**
94 * This will merge and mangle resources from a static library.
95 */
Adam Lesinskice5e56e2016-10-21 17:56:45 -070096bool TableMerger::MergeAndMangle(const Source& src,
97 const StringPiece& package_name,
Adam Lesinskicacb28f2016-10-19 12:18:14 -070098 ResourceTable* table,
99 io::IFileCollection* collection) {
100 bool error = false;
101 for (auto& package : table->packages) {
102 // Warn of packages with an unrelated ID.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700103 if (package_name != package->name) {
104 context_->GetDiagnostics()->Warn(DiagMessage(src) << "ignoring package "
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700105 << package->name);
106 continue;
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700107 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700108
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700109 bool mangle = package_name != context_->GetCompilationPackage();
110 merged_packages_.insert(package->name);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700111
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700112 auto callback = [&](
113 const ResourceNameRef& name, const ConfigDescription& config,
114 FileReference* new_file, FileReference* old_file) -> bool {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700115 // The old file's path points inside the APK, so we can use it as is.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700116 io::IFile* f = collection->FindFile(*old_file->path);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700117 if (!f) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700118 context_->GetDiagnostics()->Error(
119 DiagMessage(src) << "file '" << *old_file->path << "' not found");
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700120 return false;
121 }
122
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700123 new_file->file = f;
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700124 return true;
125 };
126
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700127 error |= !DoMerge(src, table, package.get(), mangle, false /* overlay */,
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700128 true /* allow new */, callback);
129 }
130 return !error;
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700131}
132
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700133static bool MergeType(IAaptContext* context, const Source& src,
134 ResourceTableType* dst_type,
135 ResourceTableType* src_type) {
136 if (dst_type->symbol_status.state < src_type->symbol_status.state) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700137 // The incoming type's visibility is stronger, so we should override
138 // the visibility.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700139 if (src_type->symbol_status.state == SymbolState::kPublic) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700140 // Only copy the ID if the source is public, or else the ID is
141 // meaningless.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700142 dst_type->id = src_type->id;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700143 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700144 dst_type->symbol_status = std::move(src_type->symbol_status);
145 } else if (dst_type->symbol_status.state == SymbolState::kPublic &&
146 src_type->symbol_status.state == SymbolState::kPublic &&
147 dst_type->id && src_type->id &&
148 dst_type->id.value() != src_type->id.value()) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700149 // Both types are public and have different IDs.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700150 context->GetDiagnostics()->Error(DiagMessage(src)
151 << "cannot merge type '" << src_type->type
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700152 << "': conflicting public IDs");
153 return false;
154 }
155 return true;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700156}
157
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700158static bool MergeEntry(IAaptContext* context, const Source& src,
159 ResourceEntry* dst_entry, ResourceEntry* src_entry) {
160 if (dst_entry->symbol_status.state < src_entry->symbol_status.state) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700161 // The incoming type's visibility is stronger, so we should override
162 // the visibility.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700163 if (src_entry->symbol_status.state == SymbolState::kPublic) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700164 // Only copy the ID if the source is public, or else the ID is
165 // meaningless.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700166 dst_entry->id = src_entry->id;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700167 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700168 dst_entry->symbol_status = std::move(src_entry->symbol_status);
169 } else if (src_entry->symbol_status.state == SymbolState::kPublic &&
170 dst_entry->symbol_status.state == SymbolState::kPublic &&
171 dst_entry->id && src_entry->id &&
172 dst_entry->id.value() != src_entry->id.value()) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700173 // Both entries are public and have different IDs.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700174 context->GetDiagnostics()->Error(
175 DiagMessage(src) << "cannot merge entry '" << src_entry->name
176 << "': conflicting public IDs");
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700177 return false;
178 }
179 return true;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700180}
181
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700182// Modified CollisionResolver which will merge Styleables and Styles. Used with overlays.
183//
184// Styleables are not actual resources, but they are treated as such during the
185// compilation phase.
186//
187// Styleables and Styles don't simply overlay each other, their definitions merge
188// and accumulate. If both values are Styleables/Styles, we just merge them into the
189// existing value.
190static ResourceTable::CollisionResult ResolveMergeCollision(Value* existing, Value* incoming,
191 StringPool* pool) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700192 if (Styleable* existing_styleable = ValueCast<Styleable>(existing)) {
193 if (Styleable* incoming_styleable = ValueCast<Styleable>(incoming)) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700194 // Styleables get merged.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700195 existing_styleable->MergeWith(incoming_styleable);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700196 return ResourceTable::CollisionResult::kKeepOriginal;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700197 }
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700198 } else if (Style* existing_style = ValueCast<Style>(existing)) {
199 if (Style* incoming_style = ValueCast<Style>(incoming)) {
200 // Styles get merged.
201 existing_style->MergeWith(incoming_style, pool);
202 return ResourceTable::CollisionResult::kKeepOriginal;
203 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700204 }
205 // Delegate to the default handler.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700206 return ResourceTable::ResolveValueCollision(existing, incoming);
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700207}
208
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700209static ResourceTable::CollisionResult MergeConfigValue(IAaptContext* context,
210 const ResourceNameRef& res_name,
211 const bool overlay,
212 ResourceConfigValue* dst_config_value,
213 ResourceConfigValue* src_config_value,
214 StringPool* pool) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700215 using CollisionResult = ResourceTable::CollisionResult;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700216
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700217 Value* dst_value = dst_config_value->value.get();
218 Value* src_value = src_config_value->value.get();
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700219
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700220 CollisionResult collision_result;
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700221 if (overlay) {
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700222 collision_result = ResolveMergeCollision(dst_value, src_value, pool);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700223 } else {
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700224 collision_result = ResourceTable::ResolveValueCollision(dst_value, src_value);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700225 }
226
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700227 if (collision_result == CollisionResult::kConflict) {
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700228 if (overlay) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700229 return CollisionResult::kTakeNew;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700230 }
231
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700232 // Error!
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700233 context->GetDiagnostics()->Error(DiagMessage(src_value->GetSource())
234 << "resource '" << res_name << "' has a conflicting value for "
235 << "configuration (" << src_config_value->config << ")");
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700236 context->GetDiagnostics()->Note(DiagMessage(dst_value->GetSource())
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700237 << "originally defined here");
238 return CollisionResult::kConflict;
239 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700240 return collision_result;
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700241}
242
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700243bool TableMerger::DoMerge(const Source& src, ResourceTable* src_table,
244 ResourceTablePackage* src_package,
245 const bool mangle_package, const bool overlay,
246 const bool allow_new_resources,
Chih-Hung Hsieh9b8528f2016-08-10 14:15:30 -0700247 const FileMergeCallback& callback) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700248 bool error = false;
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700249
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700250 for (auto& src_type : src_package->types) {
Adam Lesinski4488f1c2017-05-26 17:33:38 -0700251 ResourceTableType* dst_type = master_package_->FindOrCreateType(src_type->type);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700252 if (!MergeType(context_, src, dst_type, src_type.get())) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700253 error = true;
254 continue;
255 }
256
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700257 for (auto& src_entry : src_type->entries) {
258 std::string entry_name = src_entry->name;
259 if (mangle_package) {
Adam Lesinski4488f1c2017-05-26 17:33:38 -0700260 entry_name = NameMangler::MangleEntry(src_package->name, src_entry->name);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700261 }
262
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700263 ResourceEntry* dst_entry;
Adam Lesinski4488f1c2017-05-26 17:33:38 -0700264 if (allow_new_resources || src_entry->symbol_status.allow_new) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700265 dst_entry = dst_type->FindOrCreateEntry(entry_name);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700266 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700267 dst_entry = dst_type->FindEntry(entry_name);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700268 }
269
Adam Lesinski4488f1c2017-05-26 17:33:38 -0700270 const ResourceNameRef res_name(src_package->name, src_type->type, src_entry->name);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700271
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700272 if (!dst_entry) {
Adam Lesinski4488f1c2017-05-26 17:33:38 -0700273 context_->GetDiagnostics()->Error(DiagMessage(src)
274 << "resource " << res_name
275 << " does not override an existing resource");
276 context_->GetDiagnostics()->Note(DiagMessage(src) << "define an <add-resource> tag or use "
277 << "--auto-add-overlay");
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700278 error = true;
279 continue;
280 }
281
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700282 if (!MergeEntry(context_, src, dst_entry, src_entry.get())) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700283 error = true;
284 continue;
285 }
286
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700287 for (auto& src_config_value : src_entry->values) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700288 using CollisionResult = ResourceTable::CollisionResult;
289
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700290 ResourceConfigValue* dst_config_value = dst_entry->FindValue(
291 src_config_value->config, src_config_value->product);
292 if (dst_config_value) {
293 CollisionResult collision_result =
294 MergeConfigValue(context_, res_name, overlay, dst_config_value,
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700295 src_config_value.get(), &master_table_->string_pool);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700296 if (collision_result == CollisionResult::kConflict) {
Adam Lesinski5c3464c2016-08-24 16:03:48 -0700297 error = true;
298 continue;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700299 } else if (collision_result == CollisionResult::kKeepOriginal) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700300 continue;
301 }
302 } else {
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700303 dst_config_value =
304 dst_entry->FindOrCreateValue(src_config_value->config, src_config_value->product);
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700305 }
306
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700307 // Continue if we're taking the new resource.
308
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700309 if (FileReference* f = ValueCast<FileReference>(src_config_value->value.get())) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700310 std::unique_ptr<FileReference> new_file_ref;
311 if (mangle_package) {
312 new_file_ref = CloneAndMangleFile(src_package->name, *f);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700313 } else {
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700314 new_file_ref = std::unique_ptr<FileReference>(f->Clone(&master_table_->string_pool));
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700315 }
316
317 if (callback) {
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700318 if (!callback(res_name, src_config_value->config, new_file_ref.get(), f)) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700319 error = true;
320 continue;
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800321 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700322 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700323 dst_config_value->value = std::move(new_file_ref);
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800324
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700325 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700326 dst_config_value->value = std::unique_ptr<Value>(
327 src_config_value->value->Clone(&master_table_->string_pool));
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700328 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700329 }
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700330 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700331 }
332 return !error;
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700333}
334
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700335std::unique_ptr<FileReference> TableMerger::CloneAndMangleFile(
336 const std::string& package, const FileReference& file_ref) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700337 StringPiece prefix, entry, suffix;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700338 if (util::ExtractResFilePathParts(*file_ref.path, &prefix, &entry, &suffix)) {
Adam Lesinskid5083f62017-01-16 15:07:21 -0800339 std::string mangled_entry = NameMangler::MangleEntry(package, entry.to_string());
340 std::string newPath = prefix.to_string() + mangled_entry + suffix.to_string();
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700341 std::unique_ptr<FileReference> new_file_ref =
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700342 util::make_unique<FileReference>(master_table_->string_pool.MakeRef(newPath));
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700343 new_file_ref->SetComment(file_ref.GetComment());
344 new_file_ref->SetSource(file_ref.GetSource());
345 return new_file_ref;
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700346 }
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700347 return std::unique_ptr<FileReference>(file_ref.Clone(&master_table_->string_pool));
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700348}
349
Adam Lesinski5924d8c2017-05-30 15:15:58 -0700350bool TableMerger::MergeFileImpl(const ResourceFile& file_desc, io::IFile* file, bool overlay) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700351 ResourceTable table;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700352 std::string path = ResourceUtils::BuildResourceFileName(file_desc);
353 std::unique_ptr<FileReference> file_ref =
354 util::make_unique<FileReference>(table.string_pool.MakeRef(path));
355 file_ref->SetSource(file_desc.source);
356 file_ref->file = file;
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800357
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700358 ResourceTablePackage* pkg = table.CreatePackage(file_desc.name.package, 0x0);
359 pkg->FindOrCreateType(file_desc.name.type)
360 ->FindOrCreateEntry(file_desc.name.entry)
361 ->FindOrCreateValue(file_desc.config, {})
362 ->value = std::move(file_ref);
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800363
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700364 return DoMerge(file->GetSource(), &table, pkg, false /* mangle */,
365 overlay /* overlay */, true /* allow_new */, {});
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800366}
367
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700368bool TableMerger::MergeFile(const ResourceFile& file_desc, io::IFile* file) {
369 return MergeFileImpl(file_desc, file, false /* overlay */);
Adam Lesinskia6fe3452015-12-09 15:20:52 -0800370}
371
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700372bool TableMerger::MergeFileOverlay(const ResourceFile& file_desc,
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700373 io::IFile* file) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700374 return MergeFileImpl(file_desc, file, true /* overlay */);
Adam Lesinski1ab598f2015-08-14 14:26:04 -0700375}
376
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700377} // namespace aapt