aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar cpeyser <cpeyser@google.com>2017-04-28 17:52:42 +0200
committerGravatar Vladimir Moskva <vladmos@google.com>2017-04-28 18:33:33 +0200
commit0df7a3b60ccee7485f11f50cb7d696ddd767b5a1 (patch)
tree7424f9f181143bc3fcb9074c0b222471da017ecc /src
parent6f7066e3112315d259c00d5b68330a326391ec31 (diff)
Add FILES_TO_COMPILE output group to apple_static_library.
PiperOrigin-RevId: 154544281
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
index d38ec1bca6..fbc8d62307 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
@@ -40,7 +40,9 @@ import com.google.devtools.build.lib.rules.objc.ObjcCommon.ResourceAttributes;
import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key;
import com.google.devtools.build.lib.rules.proto.ProtoSourcesProvider;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
/**
* Implementation for the "apple_static_library" rule.
@@ -105,6 +107,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory {
ImmutableListMultimap<BuildConfiguration, ObjcProtoProvider> objcProtoProvidersMap =
ruleContext.getPrerequisitesByConfiguration("deps", Mode.SPLIT, ObjcProtoProvider.class);
+ Map<String, NestedSet<Artifact>> outputGroupCollector = new TreeMap<>();
for (BuildConfiguration childConfig : childConfigurations) {
ProtobufSupport protoSupport =
new ProtobufSupport(
@@ -138,6 +141,7 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory {
new CompilationSupport.Builder()
.setRuleContext(ruleContext)
.setConfig(childConfig)
+ .setOutputGroupCollector(outputGroupCollector)
.build();
compilationSupport
@@ -164,7 +168,9 @@ public class AppleStaticLibrary implements RuleConfiguredTargetFactory {
objcProviderBuilder.add(
MULTI_ARCH_LINKED_ARCHIVES, ruleIntermediateArtifacts.combinedArchitectureArchive());
- targetBuilder.addProvider(ObjcProvider.class, objcProviderBuilder.build());
+ targetBuilder
+ .addProvider(ObjcProvider.class, objcProviderBuilder.build())
+ .addOutputGroups(outputGroupCollector);
return targetBuilder.build();
}