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

2 files changed, 9 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
index a22f833748..823ecd30c8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD
@@ -1,3 +1,10 @@
+filegroup(
+    name = "srcs",
+    # include this BUILD file for the default android tools repository
+    srcs = glob(["**"]),
+    visibility = ["//src:__pkg__"],
+)
+
 java_binary(
     name = "IdlClass",
     main_class = "com.google.devtools.build.android.idlclass.IdlClass",
@@ -13,7 +20,7 @@ java_library(
         "//src/test/java/com/google/devtools/build/android/idlclass:__pkg__",
     ],
     deps = [
-        "//src/java_tools/buildjar:jarhelper",
+        "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper",
         "//src/main/java:options",
         "//src/main/protobuf:proto_java_compilation",
         "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java
index 76a9e2df9a..d6bb54e356 100644
--- a/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/IdlClass.java
@@ -19,7 +19,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.google.devtools.build.buildjar.JarCreator;
+import com.google.devtools.build.buildjar.jarhelper.JarCreator;
 import com.google.devtools.build.buildjar.proto.JavaCompilation.CompilationUnit;
 import com.google.devtools.build.buildjar.proto.JavaCompilation.Manifest;
 import com.google.devtools.common.options.OptionsParser;