diff options
Diffstat (limited to 'tools/aapt2/cmd/Link.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Link.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index e8970d48e404..7afb0000aea1 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -1659,10 +1659,8 @@ class Linker { return 1; } - // Determine the package name under which to merge resources. - if (options_.rename_resources_package) { - context_->SetCompilationPackage(options_.rename_resources_package.value()); - } else if (Maybe<AppInfo> maybe_app_info = + // First extract the package name without modifying it (via --rename-manifest-package). + if (Maybe<AppInfo> maybe_app_info = ExtractAppInfoFromManifest(manifest_xml.get(), context_->GetDiagnostics())) { // Extract the package name from the manifest ignoring the value of --rename-manifest-package. const AppInfo& app_info = maybe_app_info.value(); |