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 | |
Ryan Mitchell | 833a1a6 | 2018-07-10 13:51:36 -0700 | [diff] [blame] | 17 | #include "Diff.h" |
| 18 | |
Jeremy Meyer | 56f36e8 | 2022-05-20 20:35:42 +0000 | [diff] [blame] | 19 | #include "Diagnostics.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" |
Jeremy Meyer | 56f36e8 | 2022-05-20 20:35:42 +0000 | [diff] [blame] | 22 | #include "android-base/macros.h" |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 23 | #include "process/IResourceTableConsumer.h" |
| 24 | #include "process/SymbolTable.h" |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 25 | |
Adam Lesinski | d3ffa844 | 2017-09-28 13:34:35 -0700 | [diff] [blame] | 26 | using ::android::StringPiece; |
Adam Lesinski | d5083f6 | 2017-01-16 15:07:21 -0800 | [diff] [blame] | 27 | |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 28 | namespace aapt { |
| 29 | |
| 30 | class DiffContext : public IAaptContext { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 31 | public: |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 32 | DiffContext() : name_mangler_({}), symbol_table_(&name_mangler_) { |
| 33 | } |
Adam Lesinski | ceb9b2f | 2017-02-16 12:05:42 -0800 | [diff] [blame] | 34 | |
Adam Lesinski | b522f04 | 2017-04-21 16:57:59 -0700 | [diff] [blame] | 35 | PackageType GetPackageType() override { |
| 36 | // Doesn't matter. |
| 37 | return PackageType::kApp; |
| 38 | } |
| 39 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 40 | const std::string& GetCompilationPackage() override { |
| 41 | return empty_; |
| 42 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 43 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 44 | uint8_t GetPackageId() override { |
| 45 | return 0x0; |
| 46 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 47 | |
Jeremy Meyer | 56f36e8 | 2022-05-20 20:35:42 +0000 | [diff] [blame] | 48 | android::IDiagnostics* GetDiagnostics() override { |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 49 | return &diagnostics_; |
| 50 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 51 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 52 | NameMangler* GetNameMangler() override { |
| 53 | return &name_mangler_; |
| 54 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 55 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 56 | SymbolTable* GetExternalSymbols() override { |
| 57 | return &symbol_table_; |
| 58 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 59 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 60 | bool IsVerbose() override { |
| 61 | return false; |
| 62 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 63 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 64 | int GetMinSdkVersion() override { |
| 65 | return 0; |
| 66 | } |
Adam Lesinski | fb6312f | 2016-06-28 14:40:32 -0700 | [diff] [blame] | 67 | |
Udam Saini | b228df3 | 2019-06-18 16:50:34 -0700 | [diff] [blame] | 68 | const std::set<std::string>& GetSplitNameDependencies() override { |
| 69 | UNIMPLEMENTED(FATAL) << "Split Name Dependencies should not be necessary"; |
| 70 | static std::set<std::string> empty; |
| 71 | return empty; |
| 72 | } |
| 73 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 74 | private: |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 75 | std::string empty_; |
| 76 | StdErrDiagnostics diagnostics_; |
Adam Lesinski | ceb9b2f | 2017-02-16 12:05:42 -0800 | [diff] [blame] | 77 | NameMangler name_mangler_; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 78 | SymbolTable symbol_table_; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 79 | }; |
| 80 | |
Yurii Zubrytskyi | a577514 | 2022-11-02 17:49:49 -0700 | [diff] [blame] | 81 | static void EmitDiffLine(const android::Source& source, StringPiece message) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 82 | std::cerr << source << ": " << message << "\n"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 83 | } |
| 84 | |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 85 | static bool IsSymbolVisibilityDifferent(const Visibility& vis_a, const Visibility& vis_b) { |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 86 | return vis_a.level != vis_b.level || vis_a.staged_api != vis_b.staged_api; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 87 | } |
| 88 | |
| 89 | template <typename Id> |
Ryan Mitchell | 4382e44 | 2021-07-14 12:53:01 -0700 | [diff] [blame] | 90 | static bool IsIdDiff(const Visibility::Level& level_a, const std::optional<Id>& id_a, |
| 91 | const Visibility::Level& level_b, const std::optional<Id>& id_b) { |
Adam Lesinski | 71be705 | 2017-12-12 16:48:07 -0800 | [diff] [blame] | 92 | if (level_a == Visibility::Level::kPublic || level_b == Visibility::Level::kPublic) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 93 | return id_a != id_b; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 94 | } |
| 95 | return false; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 96 | } |
| 97 | |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 98 | static bool EmitResourceConfigValueDiff( |
| 99 | IAaptContext* context, LoadedApk* apk_a, const ResourceTablePackageView& pkg_a, |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 100 | const ResourceTableTypeView& type_a, const ResourceTableEntryView& entry_a, |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 101 | const ResourceConfigValue* config_value_a, LoadedApk* apk_b, |
| 102 | const ResourceTablePackageView& pkg_b, const ResourceTableTypeView& type_b, |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 103 | const ResourceTableEntryView& entry_b, const ResourceConfigValue* config_value_b) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 104 | Value* value_a = config_value_a->value.get(); |
| 105 | Value* value_b = config_value_b->value.get(); |
| 106 | if (!value_a->Equals(value_b)) { |
| 107 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 108 | str_stream << "value " << pkg_a.name << ":" << type_a.named_type << "/" << entry_a.name |
Yurii Zubrytskyi | 97f0f1e | 2024-07-02 15:31:01 -0700 | [diff] [blame] | 109 | << " config='" << config_value_a->config << "' does not match:\n"; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 110 | value_a->Print(&str_stream); |
| 111 | str_stream << "\n vs \n"; |
| 112 | value_b->Print(&str_stream); |
| 113 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 114 | return true; |
| 115 | } |
| 116 | return false; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 117 | } |
| 118 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 119 | static bool EmitResourceEntryDiff(IAaptContext* context, LoadedApk* apk_a, |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 120 | const ResourceTablePackageView& pkg_a, |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 121 | const ResourceTableTypeView& type_a, |
| 122 | const ResourceTableEntryView& entry_a, LoadedApk* apk_b, |
| 123 | const ResourceTablePackageView& pkg_b, |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 124 | const ResourceTableTypeView& type_b, |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 125 | const ResourceTableEntryView& entry_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 126 | bool diff = false; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 127 | for (const ResourceConfigValue* config_value_a : entry_a.values) { |
| 128 | auto config_value_b = entry_b.FindValue(config_value_a->config); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 129 | if (!config_value_b) { |
| 130 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 131 | str_stream << "missing " << pkg_a.name << ":" << type_a.named_type << "/" << entry_a.name |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 132 | << " config=" << config_value_a->config; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 133 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 134 | diff = true; |
| 135 | } else { |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 136 | diff |= EmitResourceConfigValueDiff(context, apk_a, pkg_a, type_a, entry_a, config_value_a, |
| 137 | apk_b, pkg_b, type_b, entry_b, config_value_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 138 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 139 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 140 | |
Jeremy Meyer | 3d8d4a1 | 2024-08-23 17:29:03 -0700 | [diff] [blame] | 141 | for (const ResourceConfigValue* config_value_a : entry_a.flag_disabled_values) { |
| 142 | auto config_value_b = entry_b.FindFlagDisabledValue(config_value_a->value->GetFlag().value(), |
| 143 | config_value_a->config); |
| 144 | if (!config_value_b) { |
| 145 | std::stringstream str_stream; |
| 146 | str_stream << "missing disabled value " << pkg_a.name << ":" << type_a.named_type << "/" |
| 147 | << entry_a.name << " config=" << config_value_a->config |
| 148 | << " flag=" << config_value_a->value->GetFlag()->ToString(); |
| 149 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
| 150 | diff = true; |
| 151 | } else { |
| 152 | diff |= EmitResourceConfigValueDiff(context, apk_a, pkg_a, type_a, entry_a, config_value_a, |
| 153 | apk_b, pkg_b, type_b, entry_b, config_value_b); |
| 154 | } |
| 155 | } |
| 156 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 157 | // Check for any newly added config values. |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 158 | for (const ResourceConfigValue* config_value_b : entry_b.values) { |
| 159 | auto config_value_a = entry_a.FindValue(config_value_b->config); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 160 | if (!config_value_a) { |
| 161 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 162 | str_stream << "new config " << pkg_b.name << ":" << type_b.named_type << "/" << entry_b.name |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 163 | << " config=" << config_value_b->config; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 164 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 165 | diff = true; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 166 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 167 | } |
Jeremy Meyer | 3d8d4a1 | 2024-08-23 17:29:03 -0700 | [diff] [blame] | 168 | for (const ResourceConfigValue* config_value_b : entry_b.flag_disabled_values) { |
| 169 | auto config_value_a = entry_a.FindFlagDisabledValue(config_value_b->value->GetFlag().value(), |
| 170 | config_value_b->config); |
| 171 | if (!config_value_a) { |
| 172 | std::stringstream str_stream; |
| 173 | str_stream << "new disabled config " << pkg_b.name << ":" << type_b.named_type << "/" |
| 174 | << entry_b.name << " config=" << config_value_b->config |
| 175 | << " flag=" << config_value_b->value->GetFlag()->ToString(); |
| 176 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
| 177 | diff = true; |
| 178 | } |
| 179 | } |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 180 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 181 | } |
| 182 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 183 | static bool EmitResourceTypeDiff(IAaptContext* context, LoadedApk* apk_a, |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 184 | const ResourceTablePackageView& pkg_a, |
| 185 | const ResourceTableTypeView& type_a, LoadedApk* apk_b, |
| 186 | const ResourceTablePackageView& pkg_b, |
| 187 | const ResourceTableTypeView& type_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 188 | bool diff = false; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 189 | auto entry_a_iter = type_a.entries.begin(); |
| 190 | auto entry_b_iter = type_b.entries.begin(); |
| 191 | while (entry_a_iter != type_a.entries.end() || entry_b_iter != type_b.entries.end()) { |
| 192 | if (entry_b_iter == type_b.entries.end()) { |
| 193 | // Type A contains a type that type B does not have. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 194 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 195 | str_stream << "missing " << pkg_a.name << ":" << type_a.named_type << "/" |
| 196 | << entry_a_iter->name; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 197 | EmitDiffLine(apk_a->GetSource(), str_stream.str()); |
| 198 | diff = true; |
| 199 | } else if (entry_a_iter == type_a.entries.end()) { |
| 200 | // Type B contains a type that type A does not have. |
| 201 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 202 | str_stream << "new entry " << pkg_b.name << ":" << type_b.named_type << "/" |
| 203 | << entry_b_iter->name; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 204 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 205 | diff = true; |
| 206 | } else { |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 207 | const auto& entry_a = *entry_a_iter; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 208 | const auto& entry_b = *entry_b_iter; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 209 | if (IsSymbolVisibilityDifferent(entry_a.visibility, entry_b.visibility)) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 210 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 211 | str_stream << pkg_a.name << ":" << type_a.named_type << "/" << entry_a.name |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 212 | << " has different visibility ("; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 213 | if (entry_b.visibility.staged_api) { |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 214 | str_stream << "STAGED "; |
| 215 | } |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 216 | if (entry_b.visibility.level == Visibility::Level::kPublic) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 217 | str_stream << "PUBLIC"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 218 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 219 | str_stream << "PRIVATE"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 220 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 221 | str_stream << " vs "; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 222 | if (entry_a.visibility.staged_api) { |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 223 | str_stream << "STAGED "; |
| 224 | } |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 225 | if (entry_a.visibility.level == Visibility::Level::kPublic) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 226 | str_stream << "PUBLIC"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 227 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 228 | str_stream << "PRIVATE"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 229 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 230 | str_stream << ")"; |
| 231 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 232 | diff = true; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 233 | } else if (IsIdDiff(entry_a.visibility.level, entry_a.id, entry_b.visibility.level, |
| 234 | entry_b.id)) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 235 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 236 | str_stream << pkg_a.name << ":" << type_a.named_type << "/" << entry_a.name |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 237 | << " has different public ID ("; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 238 | if (entry_b.id) { |
| 239 | str_stream << "0x" << std::hex << entry_b.id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 240 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 241 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 242 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 243 | str_stream << " vs "; |
Ryan Mitchell | 2fedba9 | 2021-04-23 07:47:38 -0700 | [diff] [blame] | 244 | if (entry_a.id) { |
| 245 | str_stream << "0x " << std::hex << entry_a.id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 246 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 247 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 248 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 249 | str_stream << ")"; |
| 250 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 251 | diff = true; |
| 252 | } |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 253 | diff |= EmitResourceEntryDiff(context, apk_a, pkg_a, type_a, entry_a, apk_b, pkg_b, type_b, |
| 254 | entry_b); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 255 | } |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 256 | if (entry_a_iter != type_a.entries.end()) { |
| 257 | ++entry_a_iter; |
| 258 | } |
| 259 | if (entry_b_iter != type_b.entries.end()) { |
| 260 | ++entry_b_iter; |
| 261 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 262 | } |
| 263 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 264 | } |
| 265 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 266 | static bool EmitResourcePackageDiff(IAaptContext* context, LoadedApk* apk_a, |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 267 | const ResourceTablePackageView& pkg_a, LoadedApk* apk_b, |
| 268 | const ResourceTablePackageView& pkg_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 269 | bool diff = false; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 270 | auto type_a_iter = pkg_a.types.begin(); |
| 271 | auto type_b_iter = pkg_b.types.begin(); |
| 272 | while (type_a_iter != pkg_a.types.end() || type_b_iter != pkg_b.types.end()) { |
| 273 | if (type_b_iter == pkg_b.types.end()) { |
| 274 | // Type A contains a type that type B does not have. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 275 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 276 | str_stream << "missing " << pkg_a.name << ":" << type_a_iter->named_type; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 277 | EmitDiffLine(apk_a->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 278 | diff = true; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 279 | } else if (type_a_iter == pkg_a.types.end()) { |
| 280 | // Type B contains a type that type A does not have. |
| 281 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 282 | str_stream << "new type " << pkg_b.name << ":" << type_b_iter->named_type; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 283 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
| 284 | diff = true; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 285 | } else { |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 286 | const auto& type_a = *type_a_iter; |
| 287 | const auto& type_b = *type_b_iter; |
| 288 | if (type_a.visibility_level != type_b.visibility_level) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 289 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 290 | str_stream << pkg_a.name << ":" << type_a.named_type << " has different visibility ("; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 291 | if (type_b.visibility_level == Visibility::Level::kPublic) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 292 | str_stream << "PUBLIC"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 293 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 294 | str_stream << "PRIVATE"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 295 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 296 | str_stream << " vs "; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 297 | if (type_a.visibility_level == Visibility::Level::kPublic) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 298 | str_stream << "PUBLIC"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 299 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 300 | str_stream << "PRIVATE"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 301 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 302 | str_stream << ")"; |
| 303 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 304 | diff = true; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 305 | } else if (IsIdDiff(type_a.visibility_level, type_a.id, type_b.visibility_level, type_b.id)) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 306 | std::stringstream str_stream; |
Iurii Makhno | f0c5ff4 | 2022-02-22 13:31:02 +0000 | [diff] [blame] | 307 | str_stream << pkg_a.name << ":" << type_a.named_type << " has different public ID ("; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 308 | if (type_b.id) { |
| 309 | str_stream << "0x" << std::hex << type_b.id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 310 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 311 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 312 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 313 | str_stream << " vs "; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 314 | if (type_a.id) { |
| 315 | str_stream << "0x " << std::hex << type_a.id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 316 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 317 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 318 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 319 | str_stream << ")"; |
| 320 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 321 | diff = true; |
| 322 | } |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 323 | diff |= EmitResourceTypeDiff(context, apk_a, pkg_a, type_a, apk_b, pkg_b, type_b); |
| 324 | } |
| 325 | if (type_a_iter != pkg_a.types.end()) { |
| 326 | ++type_a_iter; |
| 327 | } |
| 328 | if (type_b_iter != pkg_b.types.end()) { |
| 329 | ++type_b_iter; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 330 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 331 | } |
| 332 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 333 | } |
| 334 | |
Adam Lesinski | d0f492d | 2017-04-03 18:12:45 -0700 | [diff] [blame] | 335 | static bool EmitResourceTableDiff(IAaptContext* context, LoadedApk* apk_a, LoadedApk* apk_b) { |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 336 | const auto table_a = apk_a->GetResourceTable()->GetPartitionedView(); |
| 337 | const auto table_b = apk_b->GetResourceTable()->GetPartitionedView(); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 338 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 339 | bool diff = false; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 340 | auto package_a_iter = table_a.packages.begin(); |
| 341 | auto package_b_iter = table_b.packages.begin(); |
| 342 | while (package_a_iter != table_a.packages.end() || package_b_iter != table_b.packages.end()) { |
| 343 | if (package_b_iter == table_b.packages.end()) { |
| 344 | // Table A contains a package that table B does not have. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 345 | std::stringstream str_stream; |
Ryan Mitchell | 9634efb | 2021-03-19 14:53:17 -0700 | [diff] [blame] | 346 | str_stream << "missing package " << package_a_iter->name; |
| 347 | EmitDiffLine(apk_a->GetSource(), str_stream.str()); |
| 348 | diff = true; |
| 349 | } else if (package_a_iter == table_a.packages.end()) { |
| 350 | // Table B contains a package that table A does not have. |
| 351 | std::stringstream str_stream; |
| 352 | str_stream << "new package " << package_b_iter->name; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 353 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 354 | diff = true; |
| 355 | } else { |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 356 | const auto& package_a = *package_a_iter; |
| 357 | const auto& package_b = *package_b_iter; |
| 358 | if (package_a.id != package_b.id) { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 359 | std::stringstream str_stream; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 360 | str_stream << "package '" << package_a.name << "' has different id ("; |
| 361 | if (package_b.id) { |
| 362 | str_stream << "0x" << std::hex << package_b.id.value(); |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 363 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 364 | str_stream << "none"; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 365 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 366 | str_stream << " vs "; |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 367 | if (package_a.id) { |
| 368 | str_stream << "0x" << std::hex << package_b.id.value(); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 369 | } else { |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 370 | str_stream << "none"; |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 371 | } |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 372 | str_stream << ")"; |
| 373 | EmitDiffLine(apk_b->GetSource(), str_stream.str()); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 374 | diff = true; |
| 375 | } |
Ryan Mitchell | 1499f50 | 2021-03-30 12:20:08 -0700 | [diff] [blame] | 376 | diff |= EmitResourcePackageDiff(context, apk_a, package_a, apk_b, package_b); |
| 377 | } |
| 378 | if (package_a_iter != table_a.packages.end()) { |
| 379 | ++package_a_iter; |
| 380 | } |
| 381 | if (package_b_iter != table_b.packages.end()) { |
| 382 | ++package_b_iter; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 383 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 384 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 385 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 386 | return diff; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 387 | } |
| 388 | |
Adam Lesinski | d3ffa844 | 2017-09-28 13:34:35 -0700 | [diff] [blame] | 389 | class ZeroingReferenceVisitor : public DescendingValueVisitor { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 390 | public: |
Adam Lesinski | d3ffa844 | 2017-09-28 13:34:35 -0700 | [diff] [blame] | 391 | using DescendingValueVisitor::Visit; |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 392 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 393 | void Visit(Reference* ref) override { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 394 | if (ref->name && ref->id) { |
Adam Lesinski | f34b6f4 | 2017-03-03 16:33:26 -0800 | [diff] [blame] | 395 | if (ref->id.value().package_id() == kAppPackageId) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 396 | ref->id = {}; |
| 397 | } |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 398 | } |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 399 | } |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 400 | }; |
| 401 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 402 | static void ZeroOutAppReferences(ResourceTable* table) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 403 | ZeroingReferenceVisitor visitor; |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 404 | VisitAllValuesInTable(table, &visitor); |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 405 | } |
| 406 | |
Ryan Mitchell | 833a1a6 | 2018-07-10 13:51:36 -0700 | [diff] [blame] | 407 | int DiffCommand::Action(const std::vector<std::string>& args) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 408 | DiffContext context; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 409 | |
Ryan Mitchell | 833a1a6 | 2018-07-10 13:51:36 -0700 | [diff] [blame] | 410 | if (args.size() != 2u) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 411 | std::cerr << "must have two apks as arguments.\n\n"; |
Ryan Mitchell | 833a1a6 | 2018-07-10 13:51:36 -0700 | [diff] [blame] | 412 | Usage(&std::cerr); |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 413 | return 1; |
| 414 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 415 | |
Jeremy Meyer | 56f36e8 | 2022-05-20 20:35:42 +0000 | [diff] [blame] | 416 | android::IDiagnostics* diag = context.GetDiagnostics(); |
Ryan Mitchell | 833a1a6 | 2018-07-10 13:51:36 -0700 | [diff] [blame] | 417 | std::unique_ptr<LoadedApk> apk_a = LoadedApk::LoadApkFromPath(args[0], diag); |
| 418 | std::unique_ptr<LoadedApk> apk_b = LoadedApk::LoadApkFromPath(args[1], diag); |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 419 | if (!apk_a || !apk_b) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 420 | return 1; |
| 421 | } |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 422 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 423 | // Zero out Application IDs in references. |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 424 | ZeroOutAppReferences(apk_a->GetResourceTable()); |
| 425 | ZeroOutAppReferences(apk_b->GetResourceTable()); |
Adam Lesinski | 5e8fa3a | 2016-06-27 16:21:42 -0700 | [diff] [blame] | 426 | |
Adam Lesinski | ce5e56e | 2016-10-21 17:56:45 -0700 | [diff] [blame] | 427 | if (EmitResourceTableDiff(&context, apk_a.get(), apk_b.get())) { |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 428 | // We emitted a diff, so return 1 (failure). |
| 429 | return 1; |
| 430 | } |
| 431 | return 0; |
Adam Lesinski | 458b877 | 2016-04-25 14:20:21 -0700 | [diff] [blame] | 432 | } |
| 433 | |
Adam Lesinski | cacb28f | 2016-10-19 12:18:14 -0700 | [diff] [blame] | 434 | } // namespace aapt |