diff options
author | 2016-09-15 16:01:55 +0000 | |
---|---|---|
committer | 2016-09-16 07:58:44 +0000 | |
commit | df960c22f2ba057fc389ebeb6a20d5035efeb6ef (patch) | |
tree | aff500d0538af410d782a4d1d1cc5f2dd17a122d /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | |
parent | 4ce70d25cc206bba960015a97902caebfcd0c7bd (diff) |
Add a common class for filtering proto source files.
--
MOS_MIGRATED_REVID=133267681
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java index 326ce49f02..2ed8d58eaf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java @@ -24,6 +24,7 @@ import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.PROTO_COM import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.PROTO_LIB_ATTR; import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; +import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; @@ -32,6 +33,7 @@ import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; +import com.google.devtools.build.lib.rules.proto.ProtoSourceFileBlacklist; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileType; @@ -146,9 +148,9 @@ public class ObjcProtoLibraryRule implements RuleDefinition { } })) .add( - attr(PROTOBUF_WELL_KNOWN_TYPES, LABEL) - .cfg(HOST) - .value(env.getToolsLabel("//tools/objc:protobuf_well_known_types"))) + ProtoSourceFileBlacklist.blacklistFilegroupAttribute( + PROTOBUF_WELL_KNOWN_TYPES, + ImmutableList.of(env.getToolsLabel("//tools/objc:protobuf_well_known_types")))) .add( attr(XCODE_GEN_ATTR, LABEL) .cfg(HOST) |