diff options
author | Googler <noreply@google.com> | 2015-12-16 16:35:56 +0000 |
---|---|---|
committer | Nathan Harmata <nharmata@google.com> | 2015-12-16 20:24:28 +0000 |
commit | f5c3a974a7c9568cb071c56800899de6d8650c5d (patch) | |
tree | 7cb45dd7a5e510e09336d61c41a3642b9a76a9d4 /src/objc_tools/bundlemerge/java/com/google/devtools/build | |
parent | 76d94b1c2f3a92544f9c9de536b56b53a242c21a (diff) |
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
Diffstat (limited to 'src/objc_tools/bundlemerge/java/com/google/devtools/build')
-rw-r--r-- | src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java | 3 |
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()); } |