blob: 7875a2bb7a86fc8898db86f80b3a1b3afc0497ce [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
Chris Warrington481f0272018-02-06 14:03:39 +000068 bool IsAutoNamespace() override {
69 return false;
70 }
71
Adam Lesinskicacb28f2016-10-19 12:18:14 -070072 private:
Adam Lesinskice5e56e2016-10-21 17:56:45 -070073 std::string empty_;
74 StdErrDiagnostics diagnostics_;
Adam Lesinskiceb9b2f2017-02-16 12:05:42 -080075 NameMangler name_mangler_;
Adam Lesinskice5e56e2016-10-21 17:56:45 -070076 SymbolTable symbol_table_;
Adam Lesinski458b8772016-04-25 14:20:21 -070077};
78
Adam Lesinskice5e56e2016-10-21 17:56:45 -070079static void EmitDiffLine(const Source& source, const StringPiece& message) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -070080 std::cerr << source << ": " << message << "\n";
Adam Lesinski458b8772016-04-25 14:20:21 -070081}
82
Adam Lesinski71be7052017-12-12 16:48:07 -080083static bool IsSymbolVisibilityDifferent(const Visibility& vis_a, const Visibility& vis_b) {
84 return vis_a.level != vis_b.level;
Adam Lesinski458b8772016-04-25 14:20:21 -070085}
86
87template <typename Id>
Adam Lesinski71be7052017-12-12 16:48:07 -080088static bool IsIdDiff(const Visibility::Level& level_a, const Maybe<Id>& id_a,
89 const Visibility::Level& level_b, const Maybe<Id>& id_b) {
90 if (level_a == Visibility::Level::kPublic || level_b == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -070091 return id_a != id_b;
Adam Lesinskicacb28f2016-10-19 12:18:14 -070092 }
93 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -070094}
95
Adam Lesinskid0f492d2017-04-03 18:12:45 -070096static bool EmitResourceConfigValueDiff(IAaptContext* context, LoadedApk* apk_a,
97 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
98 ResourceEntry* entry_a, ResourceConfigValue* config_value_a,
99 LoadedApk* apk_b, ResourceTablePackage* pkg_b,
100 ResourceTableType* type_b, ResourceEntry* entry_b,
101 ResourceConfigValue* config_value_b) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700102 Value* value_a = config_value_a->value.get();
103 Value* value_b = config_value_b->value.get();
104 if (!value_a->Equals(value_b)) {
105 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700106 str_stream << "value " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
107 << " config=" << config_value_a->config << " does not match:\n";
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700108 value_a->Print(&str_stream);
109 str_stream << "\n vs \n";
110 value_b->Print(&str_stream);
111 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700112 return true;
113 }
114 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -0700115}
116
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700117static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700118 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700119 ResourceEntry* entry_a, LoadedApk* apk_b,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700120 ResourceTablePackage* pkg_b, ResourceTableType* type_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700121 ResourceEntry* entry_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700122 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700123 for (std::unique_ptr<ResourceConfigValue>& config_value_a : entry_a->values) {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700124 ResourceConfigValue* config_value_b = entry_b->FindValue(config_value_a->config);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700125 if (!config_value_b) {
126 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700127 str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
128 << " config=" << config_value_a->config;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700129 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700130 diff = true;
131 } else {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700132 diff |=
133 EmitResourceConfigValueDiff(context, apk_a, pkg_a, type_a, entry_a, config_value_a.get(),
134 apk_b, pkg_b, type_b, entry_b, config_value_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700135 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700136 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700137
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700138 // Check for any newly added config values.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700139 for (std::unique_ptr<ResourceConfigValue>& config_value_b : entry_b->values) {
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700140 ResourceConfigValue* config_value_a = entry_a->FindValue(config_value_b->config);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700141 if (!config_value_a) {
142 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700143 str_stream << "new config " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name
144 << " config=" << config_value_b->config;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700145 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700146 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700147 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700148 }
149 return false;
Adam Lesinski458b8772016-04-25 14:20:21 -0700150}
151
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700152static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700153 ResourceTablePackage* pkg_a, ResourceTableType* type_a,
154 LoadedApk* apk_b, ResourceTablePackage* pkg_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700155 ResourceTableType* type_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700156 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700157 for (std::unique_ptr<ResourceEntry>& entry_a : type_a->entries) {
158 ResourceEntry* entry_b = type_b->FindEntry(entry_a->name);
159 if (!entry_b) {
160 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700161 str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" << entry_a->name;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700162 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700163 diff = true;
164 } else {
Adam Lesinski71be7052017-12-12 16:48:07 -0800165 if (IsSymbolVisibilityDifferent(entry_a->visibility, entry_b->visibility)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700166 std::stringstream str_stream;
167 str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
168 << " has different visibility (";
Adam Lesinski71be7052017-12-12 16:48:07 -0800169 if (entry_b->visibility.level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700170 str_stream << "PUBLIC";
Adam Lesinski458b8772016-04-25 14:20:21 -0700171 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700172 str_stream << "PRIVATE";
Adam Lesinski458b8772016-04-25 14:20:21 -0700173 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700174 str_stream << " vs ";
Adam Lesinski71be7052017-12-12 16:48:07 -0800175 if (entry_a->visibility.level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700176 str_stream << "PUBLIC";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700177 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700178 str_stream << "PRIVATE";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700179 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700180 str_stream << ")";
181 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700182 diff = true;
Adam Lesinski71be7052017-12-12 16:48:07 -0800183 } else if (IsIdDiff(entry_a->visibility.level, entry_a->id, entry_b->visibility.level,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700184 entry_b->id)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700185 std::stringstream str_stream;
186 str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name
187 << " has different public ID (";
188 if (entry_b->id) {
189 str_stream << "0x" << std::hex << entry_b->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700190 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700191 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700192 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700193 str_stream << " vs ";
194 if (entry_a->id) {
195 str_stream << "0x " << std::hex << entry_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700196 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700197 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700198 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700199 str_stream << ")";
200 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700201 diff = true;
202 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700203 diff |= EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a.get(), apk_b, pkg_b,
204 type_b, entry_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700205 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700206 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700207
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700208 // Check for any newly added entries.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700209 for (std::unique_ptr<ResourceEntry>& entry_b : type_b->entries) {
210 ResourceEntry* entry_a = type_a->FindEntry(entry_b->name);
211 if (!entry_a) {
212 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700213 str_stream << "new entry " << pkg_b->name << ":" << type_b->type << "/" << entry_b->name;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700214 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700215 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700216 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700217 }
218 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700219}
220
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700221static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a,
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700222 ResourceTablePackage* pkg_a, LoadedApk* apk_b,
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700223 ResourceTablePackage* pkg_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700224 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700225 for (std::unique_ptr<ResourceTableType>& type_a : pkg_a->types) {
226 ResourceTableType* type_b = pkg_b->FindType(type_a->type);
227 if (!type_b) {
228 std::stringstream str_stream;
229 str_stream << "missing " << pkg_a->name << ":" << type_a->type;
230 EmitDiffLine(apk_a->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700231 diff = true;
232 } else {
Adam Lesinski71be7052017-12-12 16:48:07 -0800233 if (type_a->visibility_level != type_b->visibility_level) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700234 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700235 str_stream << pkg_a->name << ":" << type_a->type << " has different visibility (";
Adam Lesinski71be7052017-12-12 16:48:07 -0800236 if (type_b->visibility_level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700237 str_stream << "PUBLIC";
Adam Lesinski458b8772016-04-25 14:20:21 -0700238 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700239 str_stream << "PRIVATE";
Adam Lesinski458b8772016-04-25 14:20:21 -0700240 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700241 str_stream << " vs ";
Adam Lesinski71be7052017-12-12 16:48:07 -0800242 if (type_a->visibility_level == Visibility::Level::kPublic) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700243 str_stream << "PUBLIC";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700244 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700245 str_stream << "PRIVATE";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700246 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700247 str_stream << ")";
248 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700249 diff = true;
Adam Lesinski71be7052017-12-12 16:48:07 -0800250 } else if (IsIdDiff(type_a->visibility_level, type_a->id, type_b->visibility_level,
251 type_b->id)) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700252 std::stringstream str_stream;
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700253 str_stream << pkg_a->name << ":" << type_a->type << " has different public ID (";
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700254 if (type_b->id) {
255 str_stream << "0x" << std::hex << type_b->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700256 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700257 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700258 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700259 str_stream << " vs ";
260 if (type_a->id) {
261 str_stream << "0x " << std::hex << type_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700262 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700263 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700264 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700265 str_stream << ")";
266 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700267 diff = true;
268 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700269 diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a.get(), apk_b, pkg_b, type_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700270 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700271 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700272
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700273 // Check for any newly added types.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700274 for (std::unique_ptr<ResourceTableType>& type_b : pkg_b->types) {
275 ResourceTableType* type_a = pkg_a->FindType(type_b->type);
276 if (!type_a) {
277 std::stringstream str_stream;
278 str_stream << "new type " << pkg_b->name << ":" << type_b->type;
279 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700280 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700281 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700282 }
283 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700284}
285
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700286static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, LoadedApk* apk_b) {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700287 ResourceTable* table_a = apk_a->GetResourceTable();
288 ResourceTable* table_b = apk_b->GetResourceTable();
Adam Lesinski458b8772016-04-25 14:20:21 -0700289
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700290 bool diff = false;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700291 for (std::unique_ptr<ResourceTablePackage>& pkg_a : table_a->packages) {
292 ResourceTablePackage* pkg_b = table_b->FindPackage(pkg_a->name);
293 if (!pkg_b) {
294 std::stringstream str_stream;
295 str_stream << "missing package " << pkg_a->name;
296 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700297 diff = true;
298 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700299 if (pkg_a->id != pkg_b->id) {
300 std::stringstream str_stream;
301 str_stream << "package '" << pkg_a->name << "' has different id (";
302 if (pkg_b->id) {
303 str_stream << "0x" << std::hex << pkg_b->id.value();
Adam Lesinski458b8772016-04-25 14:20:21 -0700304 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700305 str_stream << "none";
Adam Lesinski458b8772016-04-25 14:20:21 -0700306 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700307 str_stream << " vs ";
308 if (pkg_a->id) {
309 str_stream << "0x" << std::hex << pkg_a->id.value();
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700310 } else {
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700311 str_stream << "none";
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700312 }
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700313 str_stream << ")";
314 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700315 diff = true;
316 }
Adam Lesinskid0f492d2017-04-03 18:12:45 -0700317 diff |= EmitResourcePackageDiff(context, apk_a, pkg_a.get(), apk_b, pkg_b);
Adam Lesinski458b8772016-04-25 14:20:21 -0700318 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700319 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700320
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700321 // Check for any newly added packages.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700322 for (std::unique_ptr<ResourceTablePackage>& pkg_b : table_b->packages) {
323 ResourceTablePackage* pkg_a = table_a->FindPackage(pkg_b->name);
324 if (!pkg_a) {
325 std::stringstream str_stream;
326 str_stream << "new package " << pkg_b->name;
327 EmitDiffLine(apk_b->GetSource(), str_stream.str());
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700328 diff = true;
Adam Lesinski458b8772016-04-25 14:20:21 -0700329 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700330 }
331 return diff;
Adam Lesinski458b8772016-04-25 14:20:21 -0700332}
333
Adam Lesinskid3ffa8442017-09-28 13:34:35 -0700334class ZeroingReferenceVisitor : public DescendingValueVisitor {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700335 public:
Adam Lesinskid3ffa8442017-09-28 13:34:35 -0700336 using DescendingValueVisitor::Visit;
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700337
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700338 void Visit(Reference* ref) override {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700339 if (ref->name && ref->id) {
Adam Lesinskif34b6f42017-03-03 16:33:26 -0800340 if (ref->id.value().package_id() == kAppPackageId) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700341 ref->id = {};
342 }
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700343 }
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700344 }
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700345};
346
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700347static void ZeroOutAppReferences(ResourceTable* table) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700348 ZeroingReferenceVisitor visitor;
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700349 VisitAllValuesInTable(table, &visitor);
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700350}
351
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700352int DiffCommand::Action(const std::vector<std::string>& args) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700353 DiffContext context;
Adam Lesinski458b8772016-04-25 14:20:21 -0700354
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700355 if (args.size() != 2u) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700356 std::cerr << "must have two apks as arguments.\n\n";
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700357 Usage(&std::cerr);
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700358 return 1;
359 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700360
Adam Lesinski8780eb62017-10-31 17:44:39 -0700361 IDiagnostics* diag = context.GetDiagnostics();
Ryan Mitchell833a1a62018-07-10 13:51:36 -0700362 std::unique_ptr<LoadedApk> apk_a = LoadedApk::LoadApkFromPath(args[0], diag);
363 std::unique_ptr<LoadedApk> apk_b = LoadedApk::LoadApkFromPath(args[1], diag);
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700364 if (!apk_a || !apk_b) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700365 return 1;
366 }
Adam Lesinski458b8772016-04-25 14:20:21 -0700367
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700368 // Zero out Application IDs in references.
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700369 ZeroOutAppReferences(apk_a->GetResourceTable());
370 ZeroOutAppReferences(apk_b->GetResourceTable());
Adam Lesinski5e8fa3a2016-06-27 16:21:42 -0700371
Adam Lesinskice5e56e2016-10-21 17:56:45 -0700372 if (EmitResourceTableDiff(&context, apk_a.get(), apk_b.get())) {
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700373 // We emitted a diff, so return 1 (failure).
374 return 1;
375 }
376 return 0;
Adam Lesinski458b8772016-04-25 14:20:21 -0700377}
378
Adam Lesinskicacb28f2016-10-19 12:18:14 -0700379} // namespace aapt