Sets the correct properties in the Info.plist, based on the environment that the

rule was executed.

--
MOS_MIGRATED_REVID=98417915

1 files changed, 1 insertions, 13 deletions

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 56632993dd..ca385f383b 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
@@ -163,20 +163,8 @@ public class PlistMerging extends Value<PlistMerging> {
     result.put("DTPlatformName", NSObject.wrap(platform.getLowerCaseNameInPlist()));
     result.put("DTSDKName", NSObject.wrap(platform.getLowerCaseNameInPlist() + sdkVersion));
     result.put("CFBundleSupportedPlatforms", new NSArray(NSObject.wrap(platform.getNameInPlist())));
+    result.put("MinimumOSVersion", NSObject.wrap(minimumOsVersion));
 
-    if (platform == Platform.DEVICE) {
-      // TODO(bazel-team): Figure out if there are more appropriate values to put here, or if any
-      // can be omitted. These have been copied from a plist file generated by Xcode for a device
-      // build.
-      result.put("DTCompiler", NSObject.wrap("com.apple.compilers.llvm.clang.1_0"));
-      result.put("BuildMachineOSBuild", NSObject.wrap("13D65"));
-      result.put("DTPlatformBuild", NSObject.wrap("11B508"));
-      result.put("DTSDKBuild", NSObject.wrap("11B508"));
-      result.put("DTXcode", NSObject.wrap("0502"));
-      result.put("DTXcodeBuild", NSObject.wrap("5A3005"));
-      result.put("DTPlatformVersion", NSObject.wrap(sdkVersion));
-      result.put("MinimumOSVersion", NSObject.wrap(minimumOsVersion));
-    }
     return result.build();
   }