Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not rename R.java package"

Browse Source
This commit is contained in:
Liz Kammer
2020-05-21 20:04:38 +00:00
committed by Gerrit Code Review
parent dbf501e0eb ad19790515
commit 5691fb68fd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt2/cmd/Link.cpp
View File

@@ -1659,10 +1659,8 @@ class Linker {
return 1; return 1;
} }
// Determine the package name under which to merge resources. // First extract the package name without modifying it (via --rename-manifest-package).
if (options_.rename_resources_package) { if (Maybe<AppInfo> maybe_app_info =
context_->SetCompilationPackage(options_.rename_resources_package.value());
} else if (Maybe<AppInfo> maybe_app_info =
ExtractAppInfoFromManifest(manifest_xml.get(), context_->GetDiagnostics())) { ExtractAppInfoFromManifest(manifest_xml.get(), context_->GetDiagnostics())) {
// Extract the package name from the manifest ignoring the value of --rename-manifest-package. // Extract the package name from the manifest ignoring the value of --rename-manifest-package.
const AppInfo& app_info = maybe_app_info.value(); const AppInfo& app_info = maybe_app_info.value();