Actually stamp java_binary targets

SeleniumHQ · Jan 30, 2018 · 42c4dc0 · 42c4dc0
1 parent 7e44e4b
commit 42c4dc0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java b/src/com/facebook/buck/jvm/java/DefaultJavaLibrary.java
@@ -454,6 +454,7 @@ public ImmutableList<Step> getBuildStampingSteps(BuildContext buildContext, Buil
     steps.addAll(
         ManifestBuildStamping.getBuildStampingSteps(
             buildContext, stamp, getProjectFilesystem(), getSourcePathToOutput()));
+
     return steps.build();
   }
 }
diff --git a/src/com/facebook/buck/jvm/java/JavaBinary.java b/src/com/facebook/buck/jvm/java/JavaBinary.java
@@ -180,8 +180,9 @@ public ImmutableList<Step> getBuildSteps(
   public ImmutableList<Step> getBuildStampingSteps(BuildContext buildContext, BuildStamp stamp) {
     Builder<Step> steps = ImmutableList.builder();
 
-    ManifestBuildStamping.getBuildStampingSteps(
-        buildContext, stamp, getProjectFilesystem(), getSourcePathToOutput());
+    steps.addAll(
+        ManifestBuildStamping.getBuildStampingSteps(
+            buildContext, stamp, getProjectFilesystem(), getSourcePathToOutput()));
 
     return steps.build();
   }

diff --git a/src/com/facebook/buck/jvm/java/ManifestBuildStamping.java b/src/com/facebook/buck/jvm/java/ManifestBuildStamping.java
@@ -42,6 +42,11 @@ static ImmutableList<Step> getBuildStampingSteps(
       BuildStamp stamp,
       ProjectFilesystem filesystem,
       SourcePath jarToModify) {
+
+    if (jarToModify == null) {
+      return ImmutableList.of();
+    }
+
     final Path outputJar = buildContext.getSourcePathResolver().getRelativePath(jarToModify);
 
     Builder<Step> steps = ImmutableList.builder();