aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google
diff options
context:
space:
mode:
authorGravatar Chris Parsons <cparsons@google.com>2016-10-18 21:47:27 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-10-19 08:26:37 +0000
commit58b6aed2c006745bf121a0e4c516b895566d6034 (patch)
treee3da6fca628167d4e610ab440e70b51f0e781bed /src/main/java/com/google
parentdf8675f71b64c0cea8c0a9e317360a7775023a85 (diff)
Expose multi-arch artifacts to objc skylark providers
-- MOS_MIGRATED_REVID=136523173
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index b1bc312b75..aa5a6e2f1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -110,7 +110,6 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive
/** Combined-architecture binaries to include in the final bundle. */
public static final Key<Artifact> MULTI_ARCH_LINKED_BINARIES =
new Key<>(STABLE_ORDER, "combined_arch_linked_binary", Artifact.class);
-
/** Combined-architecture dynamic libraries to include in the final bundle. */
public static final Key<Artifact> MULTI_ARCH_DYNAMIC_LIBRARIES =
new Key<>(STABLE_ORDER, "combined_arch_dynamic_library", Artifact.class);
@@ -414,7 +413,10 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive
BUNDLE_FILE,
BUNDLE_IMPORT_DIR,
XCASSETS_DIR,
- FRAMEWORK_DIR);
+ FRAMEWORK_DIR,
+ MULTI_ARCH_LINKED_BINARIES,
+ MULTI_ARCH_LINKED_ARCHIVES,
+ MULTI_ARCH_DYNAMIC_LIBRARIES);
/**
* Returns the skylark key for the given string, or null if no such key exists or is available