diff options
| author |  Alex Humesky <ahumesky@google.com> | 2015-07-08 18:18:33 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-07-10 17:15:23 +0000 |
| commit | d3f7eda5548fae0d9c022d9e1a0761b8e8ba22a6 (patch) | |
| tree | 8cbca5cb9298446be3ac2c539526b7714a647790 /src/test/shell | |
| parent | 525019b7bd8810ef8401ecb80247fa4226eba8c2 (diff) | |
Adds gen jar and manifest proto outputs.
Adds a jar output to Java and Android rules which contains the class files for source files generated from Java annotation processors. For a java_binary foo, the jar will be foo-gen.jar, and for a java_library foo the jar will be libfoo-gen.jar, and similarly for Android. Also adds a binary serialized proto manifest file output to Java and Android rules which describes the contents of the output class jar of those rules, which is used to create the -gen.jar. See src/main/protobuf/java_compilation.proto.
--
MOS_MIGRATED_REVID=97793715
Diffstat (limited to 'src/test/shell')
| -rw-r--r-- | src/test/shell/bazel/BUILD | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/testenv.sh | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 116b1367e6..3880ce0258 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -21,6 +21,7 @@ filegroup( "//external:jdk-default", "//src:bazel", "//src/java_tools/buildjar:JavaBuilder_deploy.jar", + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/test/shell:bashunit", "//third_party:srcs", diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index 21eb3772fc..1d71f29d08 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -212,6 +212,7 @@ function create_new_workspace() { ln -s "${javabuilder_path}" tools/jdk/JavaBuilder_deploy.jar ln -s "${singlejar_path}" tools/jdk/SingleJar_deploy.jar + ln -s "${genclass_path}" tools/jdk/GenClass_deploy.jar ln -s "${ijar_path}" tools/jdk/ijar setup_android_support diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh index 12afe3635f..44d15f35c0 100755 --- a/src/test/shell/bazel/testenv.sh +++ b/src/test/shell/bazel/testenv.sh @@ -41,6 +41,7 @@ EXTRA_BAZELRC="build --java_langtools=//tools/jdk:test-langtools" javabuilder_path="${TEST_SRCDIR}/src/java_tools/buildjar/JavaBuilder_deploy.jar" langtools_path="${TEST_SRCDIR}/third_party/java/jdk/langtools/javac.jar" singlejar_path="${TEST_SRCDIR}/src/java_tools/singlejar/SingleJar_deploy.jar" +genclass_path="${TEST_SRCDIR}/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/GenClass_deploy.jar" ijar_path="${TEST_SRCDIR}/third_party/ijar/ijar" # Third-party |