From a56762e81e306e521b3cf286a08a741376dfb6ea Mon Sep 17 00:00:00 2001 From: Anastasios Kakalis Date: Thu, 24 Sep 2015 10:42:10 +0000 Subject: 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 --- .../devtools/build/xcode/plmerge/PlistMerging.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/objc_tools') 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 e505a0d087..ac0f3cac95 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 @@ public class PlistMerging extends Value { 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 @@ public class PlistMerging extends Value { 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 conflictingEntries = Sets.difference( - Sets.intersection(automaticEntries.keySet(), merged.keySet()), - ImmutableSet.of("DTPlatformBuild", "DTSDKBuild", "DTXcode", "DTXcodeBuild")); + Set 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 " -- cgit v1.2.3