blob: 262f4fc4e394d2d73312e6024fba6e886a9d8bf0 [file] [log] [blame]
Adam Lesinski458b8772016-04-25 14:20:21 -07001/*
2 * Copyright (C) 2016 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
Ryan Mitchell833a1a62018-07-10 13:51:36 -070017#include "Diff.h"
18
Adam Lesinskice5e56e2016-10-21 17:56:45 -070019#include "android-base/macros.h"
20
Pierre Lecesneff759e62017-02-01 00:29:25 +000021#include "LoadedApk.h"
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -070022#include "ValueVisitor.h"
Adam Lesinski458b8772016-04-25 14:20:21 -070023#include "process/IResourceTableConsumer.h"
24#include "process/SymbolTable.h"
Adam Lesinski458b8772016-04-25 14:20:21 -070025
Adam Lesinskid3ffa8442017-09-28 13:34:35 -070026using ::android::StringPiece;
Adam Lesinskid5083f62017-01-16 15:07:21 -080027
Adam Lesinski458b8772016-04-25 14:20:21 -070028namespace aapt {
29
30class DiffContext : public IAaptContext {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070031 public:
Adam Lesinskid0f492d2017-04-03 18:12:45 -070032 DiffContext() : name_mangler_({}), symbol_table_(&name_mangler_) {
33 }
Adam Lesinskiceb9b2f2017-02-16 12:05:42 -080034
Adam Lesinskib522f042017-04-21 16:57:59 -070035 PackageType GetPackageType() override {
36 // Doesn't matter.
37 return PackageType::kApp;
38 }
39
Adam Lesinskid0f492d2017-04-03 18:12:45 -070040 const std::string& GetCompilationPackage() override {
41 return empty_;
42 }
Adam Lesinski458b8772016-04-25 14:20:21 -070043
Adam Lesinskid0f492d2017-04-03 18:12:45 -070044 uint8_t GetPackageId() override {
45 return 0x0;
46 }
Adam Lesinski458b8772016-04-25 14:20:21 -070047
Adam Lesinskid0f492d2017-04-03 18:12:45 -070048 IDiagnostics* GetDiagnostics() override {
49 return &diagnostics_;
50 }
Adam Lesinski458b8772016-04-25 14:20:21 -070051
Adam Lesinskid0f492d2017-04-03 18:12:45 -070052 NameMangler* GetNameMangler() override {
53 return &name_mangler_;
54 }
Adam Lesinski458b8772016-04-25 14:20:21 -070055
Adam Lesinskid0f492d2017-04-03 18:12:45 -070056 SymbolTable* GetExternalSymbols() override {
57 return &symbol_table_;
58 }
Adam Lesinski458b8772016-04-25 14:20:21 -070059
Adam Lesinskid0f492d2017-04-03 18:12:45 -070060 bool IsVerbose() override {
61 return false;
62 }
Adam Lesinski458b8772016-04-25 14:20:21 -070063
Adam Lesinskid0f492d2017-04-03 18:12:45 -070064 int GetMinSdkVersion() override {
65 return 0;
66 }
Adam Lesinskifb6312f2016-06-28 14:40:32 -070067
Adam Lesinskicacb28f2016-10-19 12:18:14 -070068 private:
Adam Lesinskice5e56e2016-10-21 17:56:45 -070069 std::string empty_;
70 StdErrDiagnostics diagnostics_;
Adam Lesinskiceb9b2f2017-02-16 12:05:42 -080071 NameMangler name_mangler_;
Adam Lesinskice5e56e2016-10-21 17:56:45 -070072 SymbolTable symbol_table_;
Adam Lesinski458b8772016-04-25 14:20:21 -070073};
74
Adam Lesinskice5e56e2016-10-21 17:56:45 -070075static void EmitDiffLine(const Source& source, const StringPiece& message) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070076 std::cerr << source << ": " << message << "\n";
Adam Lesinski458b8772016-04-25 14:20:21 -070077}
78
Adam Lesinski71be7052017-12-12 16:48:07 -080079static bool IsSymbolVisibilityDifferent(const Visibility& vis_a, const Visibility& vis_b) {
80 return vis_a.level != vis_b.level;
Adam Lesinski458b8772016-04-25 14:20:21 -070081}
82
83template <typename Id>
Adam Lesinski71be7052017-12-12 16:48:07 -080084static bool IsIdDiff(const Visibility::Level& level_a, const Maybe<Id>& id_a,
85 const Visibility::Level& level_b, const Maybe<Id>& id_b) {
86 if (level_a == Visibility::Level::kPublic || level_b == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -070087 return id_a != id_b;
Adam Lesinskicacb28f2016-10-19 12:18:14 -070088 }
89 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -070090}
91
Adam Lesinskid0f492d2017-04-03 18:12:45 -070092static bool EmitResourceConfigValueDiff(IAaptContext* context, LoadedApk* apk_a,
93 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
94 ResourceEntry* entry_a, ResourceConfigValue* config_value_a,
95 LoadedApk* apk_b, ResourceTablePackage* pkg_b,
96 ResourceTableType* type_b, ResourceEntry* entry_b,
97 ResourceConfigValue* config_value_b) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -070098 Value* value_a = config_value_a->value.get();
99 Value* value_b = config_value_b->value.get();
100 if (!value_a->Equals(value_b)) {
101 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700102 str_stream << "value " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
103 << " config=" << config_value_a->config << " does not match:\n";
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700104 value_a->Print(&str_stream);
105 str_stream << "\n vs \n";
106 value_b->Print(&str_stream);
107 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700108 return true;
109 }
110 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -0700111}
112
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700113static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700114 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700115 ResourceEntry* entry_a, LoadedApk* apk_b,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700116 ResourceTablePackage* pkg_b, ResourceTableType* type_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700117 ResourceEntry* entry_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700118 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700119 for (std::unique_ptr<ResourceConfigValue>& config_value_a : entry_a->values) {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700120 ResourceConfigValue* config_value_b = entry_b->FindValue(config_value_a->config);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700121 if (!config_value_b) {
122 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700123 str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
124 << " config=" << config_value_a->config;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700125 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700126 diff = true;
127 } else {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700128 diff |=
129 EmitResourceConfigValueDiff(context, apk_a, pkg_a, type_a, entry_a, config_value_a.get(),
130 apk_b, pkg_b, type_b, entry_b, config_value_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700131 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700132 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700133
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700134 // Check for any newly added config values.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700135 for (std::unique_ptr<ResourceConfigValue>& config_value_b : entry_b->values) {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700136 ResourceConfigValue* config_value_a = entry_a->FindValue(config_value_b->config);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700137 if (!config_value_a) {
138 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700139 str_stream << "new config " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name
140 << " config=" << config_value_b->config;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700141 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700142 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700143 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700144 }
145 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -0700146}
147
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700148static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700149 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
150 LoadedApk* apk_b, ResourceTablePackage* pkg_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700151 ResourceTableType* type_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700152 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700153 for (std::unique_ptr<ResourceEntry>& entry_a : type_a->entries) {
154 ResourceEntry* entry_b = type_b->FindEntry(entry_a->name);
155 if (!entry_b) {
156 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700157 str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700158 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700159 diff = true;
160 } else {
Adam Lesinski71be7052017-12-12 16:48:07 -0800161 if (IsSymbolVisibilityDifferent(entry_a->visibility, entry_b->visibility)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700162 std::stringstream str_stream;
163 str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
164 << " has different visibility (";
Adam Lesinski71be7052017-12-12 16:48:07 -0800165 if (entry_b->visibility.level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700166 str_stream << "PUBLIC";
Adam Lesinski458b8772016-04-25 14:20:21 -0700167 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700168 str_stream << "PRIVATE";
Adam Lesinski458b8772016-04-25 14:20:21 -0700169 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700170 str_stream << " vs ";
Adam Lesinski71be7052017-12-12 16:48:07 -0800171 if (entry_a->visibility.level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700172 str_stream << "PUBLIC";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700173 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700174 str_stream << "PRIVATE";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700175 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700176 str_stream << ")";
177 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700178 diff = true;
Adam Lesinski71be7052017-12-12 16:48:07 -0800179 } else if (IsIdDiff(entry_a->visibility.level, entry_a->id, entry_b->visibility.level,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700180 entry_b->id)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700181 std::stringstream str_stream;
182 str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
183 << " has different public ID (";
184 if (entry_b->id) {
185 str_stream << "0x" << std::hex << entry_b->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700186 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700187 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700188 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700189 str_stream << " vs ";
190 if (entry_a->id) {
191 str_stream << "0x " << std::hex << entry_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700192 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700193 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700194 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700195 str_stream << ")";
196 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700197 diff = true;
198 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700199 diff |= EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a.get(), apk_b, pkg_b,
200 type_b, entry_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700201 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700202 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700203
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700204 // Check for any newly added entries.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700205 for (std::unique_ptr<ResourceEntry>& entry_b : type_b->entries) {
206 ResourceEntry* entry_a = type_a->FindEntry(entry_b->name);
207 if (!entry_a) {
208 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700209 str_stream << "new entry " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700210 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700211 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700212 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700213 }
214 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700215}
216
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700217static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700218 ResourceTablePackage* pkg_a, LoadedApk* apk_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700219 ResourceTablePackage* pkg_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700220 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700221 for (std::unique_ptr<ResourceTableType>& type_a : pkg_a->types) {
222 ResourceTableType* type_b = pkg_b->FindType(type_a->type);
223 if (!type_b) {
224 std::stringstream str_stream;
225 str_stream << "missing " << pkg_a->name << ":" << type_a->type;
226 EmitDiffLine(apk_a->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700227 diff = true;
228 } else {
Adam Lesinski71be7052017-12-12 16:48:07 -0800229 if (type_a->visibility_level != type_b->visibility_level) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700230 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700231 str_stream << pkg_a->name << ":" << type_a->type << " has different visibility (";
Adam Lesinski71be7052017-12-12 16:48:07 -0800232 if (type_b->visibility_level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700233 str_stream << "PUBLIC";
Adam Lesinski458b8772016-04-25 14:20:21 -0700234 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700235 str_stream << "PRIVATE";
Adam Lesinski458b8772016-04-25 14:20:21 -0700236 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700237 str_stream << " vs ";
Adam Lesinski71be7052017-12-12 16:48:07 -0800238 if (type_a->visibility_level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700239 str_stream << "PUBLIC";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700240 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700241 str_stream << "PRIVATE";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700242 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700243 str_stream << ")";
244 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700245 diff = true;
Adam Lesinski71be7052017-12-12 16:48:07 -0800246 } else if (IsIdDiff(type_a->visibility_level, type_a->id, type_b->visibility_level,
247 type_b->id)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700248 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700249 str_stream << pkg_a->name << ":" << type_a->type << " has different public ID (";
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700250 if (type_b->id) {
251 str_stream << "0x" << std::hex << type_b->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700252 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700253 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700254 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700255 str_stream << " vs ";
256 if (type_a->id) {
257 str_stream << "0x " << std::hex << type_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700258 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700259 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700260 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700261 str_stream << ")";
262 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700263 diff = true;
264 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700265 diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a.get(), apk_b, pkg_b, type_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700266 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700267 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700268
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700269 // Check for any newly added types.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700270 for (std::unique_ptr<ResourceTableType>& type_b : pkg_b->types) {
271 ResourceTableType* type_a = pkg_a->FindType(type_b->type);
272 if (!type_a) {
273 std::stringstream str_stream;
274 str_stream << "new type " << pkg_b->name << ":" << type_b->type;
275 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700276 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700277 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700278 }
279 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700280}
281
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700282static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, LoadedApk* apk_b) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700283 ResourceTable* table_a = apk_a->GetResourceTable();
284 ResourceTable* table_b = apk_b->GetResourceTable();
Adam Lesinski458b8772016-04-25 14:20:21 -0700285
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700286 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700287 for (std::unique_ptr<ResourceTablePackage>& pkg_a : table_a->packages) {
288 ResourceTablePackage* pkg_b = table_b->FindPackage(pkg_a->name);
289 if (!pkg_b) {
290 std::stringstream str_stream;
291 str_stream << "missing package " << pkg_a->name;
292 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700293 diff = true;
294 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700295 if (pkg_a->id != pkg_b->id) {
296 std::stringstream str_stream;
297 str_stream << "package '" << pkg_a->name << "' has different id (";
298 if (pkg_b->id) {
299 str_stream << "0x" << std::hex << pkg_b->id.value();
Adam Lesinski458b8772016-04-25 14:20:21 -0700300 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700301 str_stream << "none";
Adam Lesinski458b8772016-04-25 14:20:21 -0700302 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700303 str_stream << " vs ";
304 if (pkg_a->id) {
305 str_stream << "0x" << std::hex << pkg_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700306 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700307 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700308 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700309 str_stream << ")";
310 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700311 diff = true;
312 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700313 diff |= EmitResourcePackageDiff(context, apk_a, pkg_a.get(), apk_b, pkg_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700314 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700315 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700316
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700317 // Check for any newly added packages.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700318 for (std::unique_ptr<ResourceTablePackage>& pkg_b : table_b->packages) {
319 ResourceTablePackage* pkg_a = table_a->FindPackage(pkg_b->name);
320 if (!pkg_a) {
321 std::stringstream str_stream;
322 str_stream << "new package " << pkg_b->name;
323 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700324 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700325 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700326 }
327 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700328}
329
Adam Lesinskid3ffa8442017-09-28 13:34:35 -0700330class ZeroingReferenceVisitor : public DescendingValueVisitor {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700331 public:
Adam Lesinskid3ffa8442017-09-28 13:34:35 -0700332 using DescendingValueVisitor::Visit;
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700333
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700334 void Visit(Reference* ref) override {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700335 if (ref->name && ref->id) {
Adam Lesinskif34b6f42017-03-03 16:33:26 -0800336 if (ref->id.value().package_id() == kAppPackageId) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700337 ref->id = {};
338 }
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700339 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700340 }
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700341};
342
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700343static void ZeroOutAppReferences(ResourceTable* table) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700344 ZeroingReferenceVisitor visitor;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700345 VisitAllValuesInTable(table, &visitor);
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700346}
347
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700348int DiffCommand::Action(const std::vector<std::string>& args) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700349 DiffContext context;
Adam Lesinski458b8772016-04-25 14:20:21 -0700350
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700351 if (args.size() != 2u) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700352 std::cerr << "must have two apks as arguments.\n\n";
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700353 Usage(&std::cerr);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700354 return 1;
355 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700356
Adam Lesinski8780eb62017-10-31 17:44:39 -0700357 IDiagnostics* diag = context.GetDiagnostics();
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700358 std::unique_ptr<LoadedApk> apk_a = LoadedApk::LoadApkFromPath(args[0], diag);
359 std::unique_ptr<LoadedApk> apk_b = LoadedApk::LoadApkFromPath(args[1], diag);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700360 if (!apk_a || !apk_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700361 return 1;
362 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700363
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700364 // Zero out Application IDs in references.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700365 ZeroOutAppReferences(apk_a->GetResourceTable());
366 ZeroOutAppReferences(apk_b->GetResourceTable());
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700367
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700368 if (EmitResourceTableDiff(&context, apk_a.get(), apk_b.get())) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700369 // We emitted a diff, so return 1 (failure).
370 return 1;
371 }
372 return 0;
Adam Lesinski458b8772016-04-25 14:20:21 -0700373}
374
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700375} // namespace aapt