diff options
author | 2017-10-13 18:39:14 +0200 | |
---|---|---|
committer | 2017-10-16 17:48:30 +0200 | |
commit | 0e2da46d5e56d5b4c7ed1ad41d21dd1ecdf9203a (patch) | |
tree | 09089df7c0f646c09ead22fa50c92a05f3490d72 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 646323535ed8360876238d8cce960f7cd5522069 (diff) |
Update documentation on objc_proto_library rule, and disable the passing of direct files into the deps attribute, only proto_library and objc_proto_library targets are allowed.
PiperOrigin-RevId: 172107133
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryRule.java | 16 |
1 files changed, 8 insertions, 8 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 5a209c878e..a6ef17df8e 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 @@ -34,6 +34,7 @@ import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.proto.ProtoSourceFileBlacklist; import com.google.devtools.build.lib.util.FileType; +import com.google.devtools.build.lib.util.FileTypeSet; /** * Rule definition for objc_proto_library. @@ -66,19 +67,18 @@ public class ObjcProtoLibraryRule implements RuleDefinition { <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .override( attr("deps", LABEL_LIST) + .allowedFileTypes(FileTypeSet.NO_FILE) .allowedRuleClasses("proto_library", "objc_proto_library") - .aspect(objcProtoAspect) - .legacyAllowAnyFileType()) + .aspect(objcProtoAspect)) /* <!-- #BLAZE_RULE(objc_proto_library).ATTRIBUTE(uses_protobuf) --> - Whether to use the new protobuf compiler and runtime for this target. If you enable this - option without passing portable_proto_filters, it will generate a filter file for all the - protos that passed through proto_library targets as deps. + This attribute is deprecated. It currently is a noop. <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add(attr(USES_PROTOBUF_ATTR, BOOLEAN).value(true)) /* <!-- #BLAZE_RULE(objc_proto_library).ATTRIBUTE(portable_proto_filters) --> - List of portable proto filters to be passed on to the protobuf compiler. This attribute - cannot be used together with the options_file, output_cpp, per_proto_includes and - use_objc_header_names attributes. + List of portable proto filters to be passed on to the protobuf compiler. If no filter files + are passed, one will be generated that whitelists every proto file listed in the + proto_library dependencies (i.e. proto files depended through other objc_proto_library + won't be automatically whitelisted). <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add( attr(PORTABLE_PROTO_FILTERS_ATTR, LABEL_LIST) |