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