commit e16028c1d7be3691473d240c91cb85803853cef3
author felly <felly@google.com> Mon Feb 10 08:45:47 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Feb 10 08:46:54 2020 -0800
tree b3784e5f75efeea4cbbba89688111a2e9da86115
parent 36754facf183afabd1521ad361102284a95392e7

Add directory output information to target completion events in BEP.

RELNOTES: None
PiperOrigin-RevId: 294228317

src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
index a7547f1..b99b6e6 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java
@@ -390,11 +390,16 @@
       builder.setTestTimeoutSeconds(testTimeoutSeconds);
     }
 
+    Iterable<Artifact> filteredImportantArtifacts = getLegacyFilteredImportantArtifacts();
+    for (Artifact artifact : filteredImportantArtifacts) {
+      if (artifact.isDirectory()) {
+        builder.addDirectoryOutput(newFileFromArtifact(artifact).build());
+      }
+    }
     // TODO(aehlig): remove direct reporting of artifacts as soon as clients no longer
     // need it.
     if (converters.getOptions().legacyImportantOutputs) {
-      addImportantOutputs(
-          completionContext, builder, converters, getLegacyFilteredImportantArtifacts());
+      addImportantOutputs(completionContext, builder, converters, filteredImportantArtifacts);
       if (baselineCoverageArtifacts != null) {
         addImportantOutputs(
             completionContext,

src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
index 5d675e9..8e901fb 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -512,6 +512,11 @@
   // new clients should not use it.
   repeated File important_output = 4 [deprecated = true];
 
+  // Report output artifacts (referenced transitively via output_group) which
+  // emit directories instead of singleton files. These directory_output entries
+  // will never include a uri.
+  repeated File directory_output = 8;
+
   // List of tags associated with this configured target.
   repeated string tag = 3;