Allow use of signing certificate name for iOS app signing.

The value of new flag --ios_signing_cert_name takes precedence over any specified
provisioning profilefor purposes of signing.

RELNOTES: --ios_signing_cert_name allows specifying a cert for iOS app signing

--
MOS_MIGRATED_REVID=104961817

1 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index 2c71164a53..3af0e97d6c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -69,6 +69,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   private final boolean enableBinaryStripping;
   private final boolean moduleMapsEnabled;
   private final ConfigurationDistinguisher configurationDistinguisher;
+  @Nullable private final String signingCertName;
   @Nullable private final Path clientWorkspaceRoot;
 
   // We only load these labels if the mode which uses them is enabled. That is known as part of the
@@ -110,6 +111,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     this.moduleMapsEnabled = objcOptions.enableModuleMaps;
     this.configurationDistinguisher = objcOptions.configurationDistinguisher;
     this.clientWorkspaceRoot = directories != null ? directories.getWorkspace() : null;
+    this.signingCertName = objcOptions.iosSigningCertName;
   }
 
   public Map<String, String> getEnvironmentForDarwin() {
@@ -326,4 +328,13 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   @Nullable public Path getClientWorkspaceRoot() {
     return this.clientWorkspaceRoot;
   }
+
+  /**
+   * Returns the flag-supplied certificate name to be used in signing or {@code null} if no such
+   * certificate was specified.
+   */
+  @Nullable
+  public String getSigningCertName() {
+    return this.signingCertName;
+  }
 }