plmerge optionally consumes an executable name. This is necessary to ensure that Blaze can assign a default executable name, for when CFBundleExecutable is not given.

--
MOS_MIGRATED_REVID=110363400

1 files changed, 2 insertions, 1 deletions

diff --git a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
index 6461fadc31..c9714b637b 100644
--- a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
+++ b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
@@ -152,7 +152,8 @@ public final class BundleMerging {
                   control.getSdkVersion(),
                   control.getMinimumOsVersion()),
               substitutionMap.build(),
-              new KeysToRemoveIfEmptyString("CFBundleIconFile", "NSPrincipalClass"));
+              new KeysToRemoveIfEmptyString("CFBundleIconFile", "NSPrincipalClass"),
+              /*executableName*/ null);
       if (control.hasExecutableName()) {
         plistMerging.setExecutableName(control.getExecutableName());
       }