diff options
author | 2015-10-02 22:57:09 +0000 | |
---|---|---|
committer | 2015-10-05 08:02:12 +0000 | |
commit | 6d00468b2eb976866cfb814d562e0d53a580a46f (patch) | |
tree | 64579ca2e6744f94240ef120e3546ca113aad806 /src/java_tools/buildjar/BUILD | |
parent | c7e974aac72ee56a0fa3788ab9222612c1a101c2 (diff) |
Add IdlClass to the embedded default android tools repository and rearrange
BuildJar's JarHelper so that it too can be embedded.
--
MOS_MIGRATED_REVID=104539260
Diffstat (limited to 'src/java_tools/buildjar/BUILD')
-rw-r--r-- | src/java_tools/buildjar/BUILD | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index 922c1280c2..d997f7f3e6 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -5,6 +5,7 @@ java_binary( srcs = glob(["java/com/google/devtools/build/buildjar/**/*.java"]), main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder", deps = [ + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper", "//src/main/protobuf:proto_deps", "//src/main/protobuf:proto_java_compilation", "//src/main/protobuf:proto_worker_protocol", @@ -151,22 +152,6 @@ java_library( deps = [":BazelJavaCompiler"], ) -# JarHelper library for GenClass so it can create the gen jar. -java_library( - name = "jarhelper", - srcs = [ - "java/com/google/devtools/build/buildjar/JarCreator.java", - "java/com/google/devtools/build/buildjar/JarHelper.java", - ], - visibility = [ - "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:__pkg__", - "//src/tools/android/java/com/google/devtools/build/android/idlclass:__pkg__", - ], - deps = [ - "//third_party:guava", - ], -) - # For the -Xbootclasspath option of the java_test of buildjar genrule( name = "langtools-test", @@ -218,7 +203,10 @@ bootstrap_java_library( bootstrap_java_binary( name = "bootstrap", - srcs = glob(["java/com/google/devtools/build/buildjar/**/*.java"]), + srcs = glob(["java/com/google/devtools/build/buildjar/**/*.java"]) + [ + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:JarCreator.java", + "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:JarHelper.java", + ], main_class = "com.google.devtools.build.buildjar.BazelJavaBuilder", visibility = ["//visibility:public"], deps = [":skylark-deps"], |