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

Merge "Add --rename-resources-package to aapt2" am: 439ac26e67

Browse Source 
Change-Id: I5d9cadeee9b1cb17fbf6f64b107f22e030860de3
This commit is contained in:
Liz Kammer
2020-05-08 16:43:02 +00:00
committed by Automerger Merge Worker
parent 72d6c813e2 439ac26e67
commit e8d9ac47f0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1659,9 +1659,12 @@ class Linker {
return 1; return 1;
} }
// First extract the Package name without modifying it (via --rename-manifest-package). // Determine the package name under which to merge resources.
if (Maybe<AppInfo> maybe_app_info = if (options_.rename_resources_package) {
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.
const AppInfo& app_info = maybe_app_info.value(); const AppInfo& app_info = maybe_app_info.value();
context_->SetCompilationPackage(app_info.package); context_->SetCompilationPackage(app_info.package);
} }

3
tools/aapt2/cmd/Link.h
View File

@@ -43,6 +43,7 @@ struct LinkOptions {
bool output_to_directory = false; bool output_to_directory = false;
bool auto_add_overlay = false; bool auto_add_overlay = false;
OutputFormat output_format = OutputFormat::kApk; OutputFormat output_format = OutputFormat::kApk;
Maybe<std::string> rename_resources_package;
// Java/Proguard options. // Java/Proguard options.
Maybe<std::string> generate_java_class_path; Maybe<std::string> generate_java_class_path;
@@ -244,6 +245,8 @@ class LinkCommand : public Command {
&options_.auto_add_overlay); &options_.auto_add_overlay);
AddOptionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml.", AddOptionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml.",
&options_.manifest_fixer_options.rename_manifest_package); &options_.manifest_fixer_options.rename_manifest_package);
AddOptionalFlag("--rename-resources-package", "Renames the package in resources table",
&options_.rename_resources_package);
AddOptionalFlag("--rename-instrumentation-target-package", AddOptionalFlag("--rename-instrumentation-target-package",
"Changes the name of the target package for instrumentation. Most useful\n" "Changes the name of the target package for instrumentation. Most useful\n"
"when used in conjunction with --rename-manifest-package.", "when used in conjunction with --rename-manifest-package.",