diff options
Diffstat (limited to 'src/objc_tools')
| -rw-r--r-- | src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java index 61d23de749..cf6373afc3 100644 --- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java +++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.xcode.plmerge; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; @@ -57,13 +58,10 @@ class MergingArguments { outFile = control.getOutFile(); variableSubstitutions = control.getVariableSubstitutionMap(); - primaryBundleId = control.getPrimaryBundleId(); - fallbackBundleId = control.getFallbackBundleId(); - if (control.hasExecutableName()) { - executableName = control.getExecutableName(); - } else { - executableName = null; - } + + primaryBundleId = Strings.emptyToNull(control.getPrimaryBundleId()); + fallbackBundleId = Strings.emptyToNull(control.getFallbackBundleId()); + executableName = Strings.emptyToNull(control.getExecutableName()); } /** |