Strict proto deps: .proto files are allowed to import other .proto files in the same srcs as they are.

--
PiperOrigin-RevId: 141604925
MOS_MIGRATED_REVID=141604925

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
index e1eef7f3f4..80bd133607 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -172,7 +172,8 @@ public class ProtoCommon {
   @Nullable
   public static NestedSet<Artifact> computeProtosInDirectDeps(RuleContext ruleContext) {
     NestedSetBuilder<Artifact> result = NestedSetBuilder.stableOrder();
-    if (ruleContext.getPrerequisiteArtifacts("srcs", TARGET).list().isEmpty()) {
+    ImmutableList<Artifact> srcs = ruleContext.getPrerequisiteArtifacts("srcs", TARGET).list();
+    if (srcs.isEmpty()) {
       for (ProtoSupportDataProvider provider :
           ruleContext.getPrerequisites("deps", TARGET, ProtoSupportDataProvider.class)) {
         result.addTransitive(provider.getSupportData().getProtosInDirectDeps());
@@ -182,6 +183,7 @@ public class ProtoCommon {
           ruleContext.getPrerequisites("deps", TARGET, ProtoSourcesProvider.class)) {
         result.addAll(provider.getCheckDepsProtoSources());
       }
+      result.addAll(srcs);
     }
     return result.build();
   }