diff options
| author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
| commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
| tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /tools/aapt2/cmd/Link.cpp | |
| parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
| parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) | |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'tools/aapt2/cmd/Link.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Link.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 4555caafb478..5b6935bafe71 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -895,7 +895,7 @@ class Linker { // android:versionCode from the framework AndroidManifest.xml. ExtractCompileSdkVersions(asset_source->GetAssetManager()); } - } else if (asset_source->IsPackageDynamic(entry.first)) { + } else if (asset_source->IsPackageDynamic(entry.first, entry.second)) { final_table_.included_packages_[entry.first] = entry.second; } } |