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

Merge "Add --rename-resources-package to aapt2" into rvc-dev am: 57ee107188

Browse Source 
Change-Id: I416f2cfeddf109c203c7e2c2e9fb827362e31555
This commit is contained in:
Automerger Merge Worker
2020-02-27 03:02:22 +00:00
parent 2477a07249 57ee107188
commit 9411c01c38
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

@@ -1766,9 +1766,12 @@ class Linker {
return 1;
}
// First extract the Package name without modifying it (via --rename-manifest-package).
if (Maybe<AppInfo> maybe_app_info =
// 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 =
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();
context_->SetCompilationPackage(app_info.package);
}

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

@@ -45,6 +45,7 @@ struct LinkOptions {
bool auto_add_overlay = false;
bool override_styles_instead_of_overlaying = false;
OutputFormat output_format = OutputFormat::kApk;
Maybe<std::string> rename_resources_package;
// Java/Proguard options.
Maybe<std::string> generate_java_class_path;
@@ -256,6 +257,8 @@ class LinkCommand : public Command {
&options_.override_styles_instead_of_overlaying);
AddOptionalFlag("--rename-manifest-package", "Renames the package in AndroidManifest.xml.",
&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",
"Changes the name of the target package for instrumentation. Most useful\n"
"when used in conjunction with --rename-manifest-package.",