diff options
| author |  Irina Iancu <elenairina@elenairina-macbookpro.roam.corp.google.com> | 2018-07-24 08:28:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-24 08:29:24 -0700 |
| commit | ff0c491b13490835695358605ffc4ec5db62ec8f (patch) | |
| tree | bc83cbe756cf8ef844bcc6a38cf55e339ce584db /src/main/java/com/google/devtools/build/lib/rules/java | |
| parent | 9d0495d00713482cbaa4c663526ed2ba1f0eb41c (diff) | |
Create the native headers jar in java_common.compile.
RELNOTES: java_common.compile creates the native headers jar accesible via JavaInfo.outputs.native_headers.
Closes #5662.
PiperOrigin-RevId: 205832180
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java index 3a28e17cca..2363803e69 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java @@ -254,13 +254,15 @@ public final class JavaLibraryHelper { helper.createGenJarAction(output, manifestProtoOutput, genClassJar, hostJavabase); } + Artifact nativeHeaderOutput = helper.createNativeHeaderJar(output); + helper.createCompileAction( output, manifestProtoOutput, genSourceJar, outputDepsProto, /* instrumentationMetadataJar= */ null, - /* nativeHeaderOutput= */ null); + nativeHeaderOutput); artifactsBuilder.addRuntimeJar(output); Artifact iJar = helper.createCompileTimeJarAction(output, artifactsBuilder); @@ -273,7 +275,8 @@ public final class JavaLibraryHelper { outputSourceJar == null ? ImmutableList.of() : ImmutableList.of(outputSourceJar); outputJarsBuilder .addOutputJar(new OutputJar(output, iJar, outputSourceJars)) - .setJdeps(outputDepsProto); + .setJdeps(outputDepsProto) + .setNativeHeaders(nativeHeaderOutput); JavaCompilationArtifacts javaArtifacts = artifactsBuilder.build(); if (javaInfoBuilder != null) { |