Expose some values needed for Apple code signing to Skylark.

--
MOS_MIGRATED_REVID=131302341

2 files changed, 9 insertions, 5 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 e22de84701..17e61b1495 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
@@ -249,6 +249,9 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
    * certificate was specified.
    */
   @Nullable
+  @SkylarkCallable(name = "signing_certificate_name", structField = true,
+      doc = "Returns the flag-supplied certificate name to be used in signing, or None if no such "
+      + "certificate was specified.")
   public String getSigningCertName() {
     return this.signingCertName;
   }
@@ -272,11 +275,14 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   /**
    * Returns whether device debug entitlements should be included when signing an application.
    *
-   * <p>Note that debug entitlements should not be included in compilation mode {@code opt}
-   * regardless of this setting.
+   * <p>Note that debug entitlements will be included only if the --device_debug_entitlements flag
+   * is set <b>and</b> the compilation mode is not {@code opt}.
    */
+  @SkylarkCallable(name = "uses_device_debug_entitlements", structField = true,
+      doc = "Returns whether device debug entitlements should be included when signing an "
+      + "application.")
   public boolean useDeviceDebugEntitlements() {
-    return deviceDebugEntitlements;
+    return deviceDebugEntitlements && compilationMode != CompilationMode.OPT;
   }
   
   /**
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 6237e7d348..26cf539a15 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
@@ -48,7 +48,6 @@ import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction;
 import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Substitution;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
-import com.google.devtools.build.lib.analysis.config.CompilationMode;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -561,7 +560,6 @@ public final class ReleaseBundlingSupport {
 
   private boolean includeDebugEntitlements() {
     return attributes.deviceDebugEntitlements() != null
-        && ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT
         && ObjcRuleClasses.objcConfiguration(ruleContext).useDeviceDebugEntitlements();
   }