2 files changed, 46 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
index 7b1a203d8f..b80ab0c524 100644
--- a/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/BUILD
@@ -4,18 +4,47 @@
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//src/tools/android/java/com/google/devtools/build/android:__pkg__"],
+    visibility = [
+        "//src/test/java/com/google/devtools/build/android/dexer:__pkg__",
+        "//src/tools/android/java/com/google/devtools/build/android:__pkg__",
+    ],
 )
 
 filegroup(
     name = "embedded_tools",
-    srcs = glob(["*.java"]) + [
+    srcs = glob(
+        ["*.java"],
+        exclude = ["NoAndroidSdkStub.java"],
+    ) + [
         "BUILD.tools",
         ":dexerdeps_deploy.jar",
     ],
     visibility = ["//visibility:public"],
 )
 
+java_library(
+    name = "dexer",
+    srcs = select({
+        "//external:has_androidsdk": glob(
+            ["*.java"],
+            exclude = ["NoAndroidSdkStub.java"],
+        ),
+        "//conditions:default": ["NoAndroidSdkStub.java"],
+    }),
+    visibility = ["//src/test/java/com/google/devtools/build/android/dexer:__pkg__"],
+    deps = [
+        "//src/main/java/com/google/devtools/common/options",
+        "//src/main/protobuf:worker_protocol_java_proto",
+        "//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
+        "//third_party:auto_value",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ] + select({
+        "//external:has_androidsdk": ["//external:android/dx_jar_import"],
+        "//conditions:default": [],
+    }),
+)
+
 # The DexFileMerger and DexBuilder are built in BUILD.tools which is built in
 # a developers workspace, not the Bazel workspace. So we must bundle the
 # dependencies of those binaries into the embedded tools. We use a java_binary
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/NoAndroidSdkStub.java b/src/tools/android/java/com/google/devtools/build/android/dexer/NoAndroidSdkStub.java
new file mode 100644
index 0000000000..97db1df50d
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/dexer/NoAndroidSdkStub.java
@@ -0,0 +1,15 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.android.dexer;
+class NoAndroidSdkStub {}