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

rule was executed.

--
MOS_MIGRATED_REVID=98417915

3 files changed, 39 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
index 799597bee0..b10bc05b16 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
@@ -68,7 +68,7 @@ public class IosSdkCommands {
     return Platform.forArch(configuration.getIosCpu()).getNameInPlist();
   }
 
-  private static String platformDir(ObjcConfiguration configuration) {
+  public static String platformDir(ObjcConfiguration configuration) {
     return DEVELOPER_DIR + "/Platforms/" + getPlatformPlistName(configuration) + ".platform";
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
index dc0fa8eca7..025dac666b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
@@ -219,6 +219,7 @@ public final class ReleaseBundlingSupport {
     }
 
     registerEmbedLabelPlistAction();
+    registerEnvironmentPlistAction();
 
     BundleMergeControlBytes bundleMergeControlBytes = new BundleMergeControlBytes(
         bundling, maybeSignedIpa, objcConfiguration, bundleSupport.targetDeviceFamilies());
@@ -266,6 +267,36 @@ public final class ReleaseBundlingSupport {
         .build(ruleContext));
   }
 
+  private void registerEnvironmentPlistAction() {
+    ObjcConfiguration configuration = ObjcRuleClasses.objcConfiguration(ruleContext);
+    // Generates a .plist that contains environment values (such as the SDK used to build, the Xcode
+    // version, etc), which are parsed from various .plist files of the OS, namely XCodes' and
+    // Platforms' plists.
+    // The resulting file is meant to be merged with the final bundle.
+    String command = Joiner.on(" && ").join(
+        "PLATFORM_PLIST=" + IosSdkCommands.platformDir(configuration) + "/Info.plist",
+        "PLIST=${TMPDIR}/env.plist",
+        "os_build=$(/usr/bin/defaults read ${PLATFORM_PLIST} BuildMachineOSBuild)",
+        "compiler=$(/usr/bin/defaults read ${PLATFORM_PLIST} DTCompiler)",
+        "platform_version=$(/usr/bin/defaults read ${PLATFORM_PLIST} Version)",
+        "sdk_build=$(/usr/bin/defaults read ${PLATFORM_PLIST} DTSDKBuild)",
+        "platform_build=$(/usr/bin/defaults read ${PLATFORM_PLIST} DTPlatformBuild)",
+        "xcode_build=$(/usr/bin/defaults read ${PLATFORM_PLIST} DTXcodeBuild)",
+        "xcode_version=$(/usr/bin/defaults read ${PLATFORM_PLIST} DTXcode)",
+        "/usr/bin/defaults write ${PLIST} DTPlatformBuild -string ${platform_build}",
+        "/usr/bin/defaults write ${PLIST} DTSDKBuild -string ${sdk_build}",
+        "/usr/bin/defaults write ${PLIST} DTPlatformVersion -string ${platform_version}",
+        "/usr/bin/defaults write ${PLIST} DTXcode -string ${xcode_version}",
+        "/usr/bin/defaults write ${PLIST} DTXCodeBuild -string ${xcode_build}",
+        "/usr/bin/defaults write ${PLIST} DTCompiler -string ${compiler}",
+        "/usr/bin/defaults write ${PLIST} BuildMachineOSBuild -string ${os_build}",
+        "cat ${PLIST} > " + getGeneratedEnvironmentPlist().getShellEscapedExecPathString());
+    ruleContext.registerAction(ObjcRuleClasses.spawnBashOnDarwinActionBuilder(command)
+        .setMnemonic("EnvironmentPlist")
+        .addOutput(getGeneratedEnvironmentPlist())
+        .build(ruleContext));
+  }
+
   private Artifact registerBundleSigningActions(Artifact ipaOutput) {
     PathFragment entitlementsDirectory = ruleContext.getUniqueDirectory("entitlements");
     Artifact teamPrefixFile =
@@ -433,6 +464,7 @@ public final class ReleaseBundlingSupport {
         .setObjcProvider(objcProvider)
         .addInfoplistInputFromRule(ruleContext)
         .addInfoplistInput(getGeneratedVersionPlist())
+        .addInfoplistInput(getGeneratedEnvironmentPlist())
         .setIntermediateArtifacts(ObjcRuleClasses.intermediateArtifacts(ruleContext))
         .setPrimaryBundleId(primaryBundleId)
         .setFallbackBundleId(fallbackBundleId)
@@ -726,6 +758,11 @@ public final class ReleaseBundlingSupport {
         ruleContext.getUniqueDirectory("plists"), "-version.plist");
   }
 
+  private Artifact getGeneratedEnvironmentPlist() {
+    return ruleContext.getRelatedArtifact(
+        ruleContext.getUniqueDirectory("plists"), "-environment.plist");
+  }
+
   /**
    * Logic to access attributes required by application support. Attributes are required and
    * guaranteed to return a value or throw unless they are annotated with {@link Nullable} in which
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();
   }