Loading tools/aapt2/cmd/Link.cpp +12 −5 Original line number Diff line number Diff line Loading @@ -1766,16 +1766,23 @@ 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(); context_->SetCompilationPackage(app_info.package); } // Determine the package name under which to merge resources. if (options_.rename_resources_package) { if (!options_.custom_java_package) { // Generate the R.java under the original package name instead of the package name specified // through --rename-resources-package. options_.custom_java_package = context_->GetCompilationPackage(); } context_->SetCompilationPackage(options_.rename_resources_package.value()); } // Now that the compilation package is set, load the dependencies. This will also extract // the Android framework's versionCode and versionName, if they exist. if (!LoadSymbolsFromIncludePaths()) { Loading Loading
tools/aapt2/cmd/Link.cpp +12 −5 Original line number Diff line number Diff line Loading @@ -1766,16 +1766,23 @@ 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(); context_->SetCompilationPackage(app_info.package); } // Determine the package name under which to merge resources. if (options_.rename_resources_package) { if (!options_.custom_java_package) { // Generate the R.java under the original package name instead of the package name specified // through --rename-resources-package. options_.custom_java_package = context_->GetCompilationPackage(); } context_->SetCompilationPackage(options_.rename_resources_package.value()); } // Now that the compilation package is set, load the dependencies. This will also extract // the Android framework's versionCode and versionName, if they exist. if (!LoadSymbolsFromIncludePaths()) { Loading