Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5691fb68 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Do not rename R.java package"

parents dbf501e0 ad197905
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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();