Removes the automatic values from the bundlemerge.jar and plmerge.jar and relies
on the environment_plist.sh to populate the right values in the Info.plist.
--
MOS_MIGRATED_REVID=103831542
diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
index e505a0d..ac0f3ca 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
@@ -165,15 +165,6 @@
result.put("CFBundleSupportedPlatforms", new NSArray(NSObject.wrap(platform.getNameInPlist())));
result.put("MinimumOSVersion", NSObject.wrap(minimumOsVersion));
- // Adding these here by brute force to override values inserted by
- // release bundling support which are wrong.
- // These shall be removed once the errors in release bundling support are fixed.
- // These values are taken from an Xcode 6.2 device build.
- // Adding them to a simulator build causes no problems when tested with Xcode 6.2.
- result.put("DTPlatformBuild", NSObject.wrap("12D508"));
- result.put("DTSDKBuild", NSObject.wrap("12D508"));
- result.put("DTXcode", NSObject.wrap("0620"));
- result.put("DTXcodeBuild", NSObject.wrap("6C131e"));
return result.build();
}
@@ -186,12 +177,7 @@
throws IOException {
NSDictionary merged = PlistMerging.merge(sourceFiles);
- // Remove the entries that we have added by brute force in automaticEntries so that our
- // check for conflictingEntries still works.
- // This shall be removed once the errors in release bundling support are fixed.
- Set<String> conflictingEntries = Sets.difference(
- Sets.intersection(automaticEntries.keySet(), merged.keySet()),
- ImmutableSet.of("DTPlatformBuild", "DTSDKBuild", "DTXcode", "DTXcodeBuild"));
+ Set<String> conflictingEntries = Sets.intersection(automaticEntries.keySet(), merged.keySet());
Preconditions.checkArgument(conflictingEntries.isEmpty(),
"The following plist entries are generated automatically, but are present in more than one "
