Automated rollback of commit f358961125ae909508782f8f1100fb3f8c4f7971. *** Reason for rollback *** b/116203103 *** Original change description *** Skip uploading source files to BEP. Instead of trusting Artifact#isSource, we resolve all symlinks and compare against the package path. RELNOTES: None PiperOrigin-RevId: 213863245
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 a4c793b..1906853 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
@@ -302,13 +302,19 @@ for (ArtifactsInOutputGroup group : outputs) { if (group.areImportant()) { for (Artifact artifact : group.getArtifacts()) { - builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT)); + builder.add( + new LocalFile( + pathResolver.toPath(artifact), + artifact.isSourceArtifact() ? LocalFileType.SOURCE : LocalFileType.OUTPUT)); } } } if (baselineCoverageArtifacts != null) { for (Artifact artifact : baselineCoverageArtifacts) { - builder.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT)); + builder.add( + new LocalFile( + pathResolver.toPath(artifact), + artifact.isSourceArtifact() ? LocalFileType.SOURCE : LocalFileType.OUTPUT)); } } return builder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java index 3a6cd03..3342909 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java
@@ -40,6 +40,7 @@ * associated files for. */ public enum LocalFileType { + SOURCE, OUTPUT, SUCCESSFUL_TEST_OUTPUT, FAILED_TEST_OUTPUT,
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java index 2ec940d..9bf0f23 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java
@@ -64,7 +64,10 @@ if (artifact.isMiddlemanArtifact()) { continue; } - artifacts.add(new LocalFile(pathResolver.toPath(artifact), LocalFileType.OUTPUT)); + artifacts.add( + new LocalFile( + pathResolver.toPath(artifact), + artifact.isSourceArtifact() ? LocalFileType.SOURCE : LocalFileType.OUTPUT)); } return artifacts.build(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 5c5044c..c050c9f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1041,10 +1041,6 @@ return pkgLocator.get().getPathEntries(); } - public AtomicReference<PathPackageLocator> getPackageLocator() { - return pkgLocator; - } - protected abstract void invalidate(Predicate<SkyKey> pred); private static boolean compatibleFileTypes(Dirent.Type oldType, FileStateType newType) {