Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 1 | /* |
| 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 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 17 | #include "android-base/macros.h" |
| 18 | |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 19 | #include "Flags.h" |
Pierre Lecesne | ff759e6 | 2017-02-01 00:29:25 +0000 | [diff] [blame] | 20 | #include "LoadedApk.h" |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 21 | #include "ValueVisitor.h" |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 22 | #include "process/IResourceTableConsumer.h" |
| 23 | #include "process/SymbolTable.h" |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 24 | |
Adam Lesinski | d5083f6 | 2017-01-16 15:07:21 -0800 | [diff] [blame] | 25 | using android::StringPiece; |
| 26 | |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 27 | namespace aapt { |
| 28 | |
| 29 | class DiffContext : public IAaptContext { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 30 | public: |
Adam Lesinski | ceb9b2f | 2017-02-16 12:05:42 -0800 | [diff] [blame^] | 31 | DiffContext() : name_mangler_({}), symbol_table_(&name_mangler_) {} |
| 32 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 33 | const std::string& GetCompilationPackage() override { return empty_; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 34 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 35 | uint8_t GetPackageId() override { return 0x0; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 36 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 37 | IDiagnostics* GetDiagnostics() override { return &diagnostics_; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 38 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 39 | NameMangler* GetNameMangler() override { return &name_mangler_; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 40 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 41 | SymbolTable* GetExternalSymbols() override { return &symbol_table_; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 42 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 43 | bool IsVerbose() override { return false; } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 44 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 45 | int GetMinSdkVersion() override { return 0; } |
Adam Lesinski | fb6312f | 2016-06-28 14:40:32 -0700 | [diff] [blame] | 46 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 47 | private: |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 48 | std::string empty_; |
| 49 | StdErrDiagnostics diagnostics_; |
Adam Lesinski | ceb9b2f | 2017-02-16 12:05:42 -0800 | [diff] [blame^] | 50 | NameMangler name_mangler_; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 51 | SymbolTable symbol_table_; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 52 | }; |
| 53 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 54 | static void EmitDiffLine(const Source& source, const StringPiece& message) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 55 | std::cerr << source << ": " << message << "\n"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 56 | } |
| 57 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 58 | static bool IsSymbolVisibilityDifferent(const Symbol& symbol_a, |
| 59 | const Symbol& symbol_b) { |
| 60 | return symbol_a.state != symbol_b.state; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 61 | } |
| 62 | |
| 63 | template <typename Id> |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 64 | static bool IsIdDiff(const Symbol& symbol_a, const Maybe<Id>& id_a, |
| 65 | const Symbol& symbol_b, const Maybe<Id>& id_b) { |
| 66 | if (symbol_a.state == SymbolState::kPublic || |
| 67 | symbol_b.state == SymbolState::kPublic) { |
| 68 | return id_a != id_b; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 69 | } |
| 70 | return false; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 71 | } |
| 72 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 73 | static bool EmitResourceConfigValueDiff( |
| 74 | IAaptContext* context, LoadedApk* apk_a, ResourceTablePackage* pkg_a, |
| 75 | ResourceTableType* type_a, ResourceEntry* entry_a, |
| 76 | ResourceConfigValue* config_value_a, LoadedApk* apk_b, |
| 77 | ResourceTablePackage* pkg_b, ResourceTableType* type_b, |
| 78 | ResourceEntry* entry_b, ResourceConfigValue* config_value_b) { |
| 79 | Value* value_a = config_value_a->value.get(); |
| 80 | Value* value_b = config_value_b->value.get(); |
| 81 | if (!value_a->Equals(value_b)) { |
| 82 | std::stringstream str_stream; |
| 83 | str_stream << "value " << pkg_a->name << ":" << type_a->type << "/" |
| 84 | << entry_a->name << " config=" << config_value_a->config |
| 85 | << " does not match:\n"; |
| 86 | value_a->Print(&str_stream); |
| 87 | str_stream << "\n vs \n"; |
| 88 | value_b->Print(&str_stream); |
| 89 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 90 | return true; |
| 91 | } |
| 92 | return false; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 93 | } |
| 94 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 95 | static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a, |
| 96 | ResourceTablePackage* pkg_a, |
| 97 | ResourceTableType* type_a, |
| 98 | ResourceEntry* entry_a, LoadedApk* apk_b, |
| 99 | ResourceTablePackage* pkg_b, |
| 100 | ResourceTableType* type_b, |
| 101 | ResourceEntry* entry_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 102 | bool diff = false; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 103 | for (std::unique_ptr<ResourceConfigValue>& config_value_a : entry_a->values) { |
| 104 | ResourceConfigValue* config_value_b = |
| 105 | entry_b->FindValue(config_value_a->config); |
| 106 | if (!config_value_b) { |
| 107 | std::stringstream str_stream; |
| 108 | str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" |
| 109 | << entry_a->name << " config=" << config_value_a->config; |
| 110 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 111 | diff = true; |
| 112 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 113 | diff |= EmitResourceConfigValueDiff( |
| 114 | context, apk_a, pkg_a, type_a, entry_a, config_value_a.get(), apk_b, |
| 115 | pkg_b, type_b, entry_b, config_value_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 116 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 117 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 118 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 119 | // Check for any newly added config values. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 120 | for (std::unique_ptr<ResourceConfigValue>& config_value_b : entry_b->values) { |
| 121 | ResourceConfigValue* config_value_a = |
| 122 | entry_a->FindValue(config_value_b->config); |
| 123 | if (!config_value_a) { |
| 124 | std::stringstream str_stream; |
| 125 | str_stream << "new config " << pkg_b->name << ":" << type_b->type << "/" |
| 126 | << entry_b->name << " config=" << config_value_b->config; |
| 127 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 128 | diff = true; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 129 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 130 | } |
| 131 | return false; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 132 | } |
| 133 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 134 | static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, |
| 135 | ResourceTablePackage* pkg_a, |
| 136 | ResourceTableType* type_a, LoadedApk* apk_b, |
| 137 | ResourceTablePackage* pkg_b, |
| 138 | ResourceTableType* type_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 139 | bool diff = false; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 140 | for (std::unique_ptr<ResourceEntry>& entry_a : type_a->entries) { |
| 141 | ResourceEntry* entry_b = type_b->FindEntry(entry_a->name); |
| 142 | if (!entry_b) { |
| 143 | std::stringstream str_stream; |
| 144 | str_stream << "missing " << pkg_a->name << ":" << type_a->type << "/" |
| 145 | << entry_a->name; |
| 146 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 147 | diff = true; |
| 148 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 149 | if (IsSymbolVisibilityDifferent(entry_a->symbol_status, |
| 150 | entry_b->symbol_status)) { |
| 151 | std::stringstream str_stream; |
| 152 | str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name |
| 153 | << " has different visibility ("; |
| 154 | if (entry_b->symbol_status.state == SymbolState::kPublic) { |
| 155 | str_stream << "PUBLIC"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 156 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 157 | str_stream << "PRIVATE"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 158 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 159 | str_stream << " vs "; |
| 160 | if (entry_a->symbol_status.state == SymbolState::kPublic) { |
| 161 | str_stream << "PUBLIC"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 162 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 163 | str_stream << "PRIVATE"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 164 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 165 | str_stream << ")"; |
| 166 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 167 | diff = true; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 168 | } else if (IsIdDiff(entry_a->symbol_status, entry_a->id, |
| 169 | entry_b->symbol_status, entry_b->id)) { |
| 170 | std::stringstream str_stream; |
| 171 | str_stream << pkg_a->name << ":" << type_a->type << "/" << entry_a->name |
| 172 | << " has different public ID ("; |
| 173 | if (entry_b->id) { |
| 174 | str_stream << "0x" << std::hex << entry_b->id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 175 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 176 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 177 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 178 | str_stream << " vs "; |
| 179 | if (entry_a->id) { |
| 180 | str_stream << "0x " << std::hex << entry_a->id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 181 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 182 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 183 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 184 | str_stream << ")"; |
| 185 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 186 | diff = true; |
| 187 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 188 | diff |= |
| 189 | EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a.get(), |
| 190 | apk_b, pkg_b, type_b, entry_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 191 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 192 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 193 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 194 | // Check for any newly added entries. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 195 | for (std::unique_ptr<ResourceEntry>& entry_b : type_b->entries) { |
| 196 | ResourceEntry* entry_a = type_a->FindEntry(entry_b->name); |
| 197 | if (!entry_a) { |
| 198 | std::stringstream str_stream; |
| 199 | str_stream << "new entry " << pkg_b->name << ":" << type_b->type << "/" |
| 200 | << entry_b->name; |
| 201 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 202 | diff = true; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 203 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 204 | } |
| 205 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 206 | } |
| 207 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 208 | static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, |
| 209 | ResourceTablePackage* pkg_a, |
| 210 | LoadedApk* apk_b, |
| 211 | ResourceTablePackage* pkg_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 212 | bool diff = false; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 213 | for (std::unique_ptr<ResourceTableType>& type_a : pkg_a->types) { |
| 214 | ResourceTableType* type_b = pkg_b->FindType(type_a->type); |
| 215 | if (!type_b) { |
| 216 | std::stringstream str_stream; |
| 217 | str_stream << "missing " << pkg_a->name << ":" << type_a->type; |
| 218 | EmitDiffLine(apk_a->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 219 | diff = true; |
| 220 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 221 | if (IsSymbolVisibilityDifferent(type_a->symbol_status, |
| 222 | type_b->symbol_status)) { |
| 223 | std::stringstream str_stream; |
| 224 | str_stream << pkg_a->name << ":" << type_a->type |
| 225 | << " has different visibility ("; |
| 226 | if (type_b->symbol_status.state == SymbolState::kPublic) { |
| 227 | str_stream << "PUBLIC"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 228 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 229 | str_stream << "PRIVATE"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 230 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 231 | str_stream << " vs "; |
| 232 | if (type_a->symbol_status.state == SymbolState::kPublic) { |
| 233 | str_stream << "PUBLIC"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 234 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 235 | str_stream << "PRIVATE"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 236 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 237 | str_stream << ")"; |
| 238 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 239 | diff = true; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 240 | } else if (IsIdDiff(type_a->symbol_status, type_a->id, |
| 241 | type_b->symbol_status, type_b->id)) { |
| 242 | std::stringstream str_stream; |
| 243 | str_stream << pkg_a->name << ":" << type_a->type |
| 244 | << " has different public ID ("; |
| 245 | if (type_b->id) { |
| 246 | str_stream << "0x" << std::hex << type_b->id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 247 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 248 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 249 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 250 | str_stream << " vs "; |
| 251 | if (type_a->id) { |
| 252 | str_stream << "0x " << std::hex << type_a->id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 253 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 254 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 255 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 256 | str_stream << ")"; |
| 257 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 258 | diff = true; |
| 259 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 260 | diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a.get(), apk_b, |
| 261 | pkg_b, type_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 262 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 263 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 264 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 265 | // Check for any newly added types. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 266 | for (std::unique_ptr<ResourceTableType>& type_b : pkg_b->types) { |
| 267 | ResourceTableType* type_a = pkg_a->FindType(type_b->type); |
| 268 | if (!type_a) { |
| 269 | std::stringstream str_stream; |
| 270 | str_stream << "new type " << pkg_b->name << ":" << type_b->type; |
| 271 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 272 | diff = true; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 273 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 274 | } |
| 275 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 276 | } |
| 277 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 278 | static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, |
| 279 | LoadedApk* apk_b) { |
| 280 | ResourceTable* table_a = apk_a->GetResourceTable(); |
| 281 | ResourceTable* table_b = apk_b->GetResourceTable(); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 282 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 283 | bool diff = false; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 284 | for (std::unique_ptr<ResourceTablePackage>& pkg_a : table_a->packages) { |
| 285 | ResourceTablePackage* pkg_b = table_b->FindPackage(pkg_a->name); |
| 286 | if (!pkg_b) { |
| 287 | std::stringstream str_stream; |
| 288 | str_stream << "missing package " << pkg_a->name; |
| 289 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 290 | diff = true; |
| 291 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 292 | if (pkg_a->id != pkg_b->id) { |
| 293 | std::stringstream str_stream; |
| 294 | str_stream << "package '" << pkg_a->name << "' has different id ("; |
| 295 | if (pkg_b->id) { |
| 296 | str_stream << "0x" << std::hex << pkg_b->id.value(); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 297 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 298 | str_stream << "none"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 299 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 300 | str_stream << " vs "; |
| 301 | if (pkg_a->id) { |
| 302 | str_stream << "0x" << std::hex << pkg_a->id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 303 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 304 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 305 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 306 | str_stream << ")"; |
| 307 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 308 | diff = true; |
| 309 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 310 | diff |= |
| 311 | EmitResourcePackageDiff(context, apk_a, pkg_a.get(), apk_b, pkg_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 312 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 313 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 314 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 315 | // Check for any newly added packages. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 316 | for (std::unique_ptr<ResourceTablePackage>& pkg_b : table_b->packages) { |
| 317 | ResourceTablePackage* pkg_a = table_a->FindPackage(pkg_b->name); |
| 318 | if (!pkg_a) { |
| 319 | std::stringstream str_stream; |
| 320 | str_stream << "new package " << pkg_b->name; |
| 321 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 322 | diff = true; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 323 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 324 | } |
| 325 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 326 | } |
| 327 | |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 328 | class ZeroingReferenceVisitor : public ValueVisitor { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 329 | public: |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 330 | using ValueVisitor::Visit; |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 331 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 332 | void Visit(Reference* ref) override { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 333 | if (ref->name && ref->id) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 334 | if (ref->id.value().package_id() == 0x7f) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 335 | ref->id = {}; |
| 336 | } |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 337 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 338 | } |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 339 | }; |
| 340 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 341 | static void ZeroOutAppReferences(ResourceTable* table) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 342 | ZeroingReferenceVisitor visitor; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 343 | VisitAllValuesInTable(table, &visitor); |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 344 | } |
| 345 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 346 | int Diff(const std::vector<StringPiece>& args) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 347 | DiffContext context; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 348 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 349 | Flags flags; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 350 | if (!flags.Parse("aapt2 diff", args, &std::cerr)) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 351 | return 1; |
| 352 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 353 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 354 | if (flags.GetArgs().size() != 2u) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 355 | std::cerr << "must have two apks as arguments.\n\n"; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 356 | flags.Usage("aapt2 diff", &std::cerr); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 357 | return 1; |
| 358 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 359 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 360 | std::unique_ptr<LoadedApk> apk_a = |
Pierre Lecesne | ff759e6 | 2017-02-01 00:29:25 +0000 | [diff] [blame] | 361 | LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[0]); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 362 | std::unique_ptr<LoadedApk> apk_b = |
Pierre Lecesne | ff759e6 | 2017-02-01 00:29:25 +0000 | [diff] [blame] | 363 | LoadedApk::LoadApkFromPath(&context, flags.GetArgs()[1]); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 364 | if (!apk_a || !apk_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 365 | return 1; |
| 366 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 367 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 368 | // Zero out Application IDs in references. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 369 | ZeroOutAppReferences(apk_a->GetResourceTable()); |
| 370 | ZeroOutAppReferences(apk_b->GetResourceTable()); |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 371 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 372 | if (EmitResourceTableDiff(&context, apk_a.get(), apk_b.get())) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 373 | // We emitted a diff, so return 1 (failure). |
| 374 | return 1; |
| 375 | } |
| 376 | return 0; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 377 | } |
| 378 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 379 | } // namespace aapt |