From 65b49a2ee3968bbfd53d6ae4f954b9d840ace68a Mon Sep 17 00:00:00 2001
From: Adam Michael <ajmichael@google.com>
Date: Wed, 22 Feb 2017 20:06:58 +0000
Subject: Remove mobile-install stub app targets from BUILD files.

These targets are unneeded and do not build without an android_sdk_repository
set up.

This issue was identified in https://github.com/bazelbuild/bazel/issues/2559.

--
PiperOrigin-RevId: 148251416
MOS_MIGRATED_REVID=148251416
---
 src/BUILD                                            |  1 -
 .../java/com/google/devtools/build/android/BUILD     |  1 +
 .../build/android/incrementaldeployment/BUILD        | 20 ++++++--------------
 .../build/android/incrementaldeployment/BUILD.tools  | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD.tools

diff --git a/src/BUILD b/src/BUILD
index c00823e641..60001d67ef 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -140,7 +140,6 @@ genrule(
         "//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/ideinfo:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/idlclass:embedded_tools",
-        "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs",
         "//src/tools/android/java/com/google/devtools/build/android/dexer:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools",
         "//src/main/protobuf:srcs",
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD
index 56027340ca..209f8c05a8 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -8,6 +8,7 @@ filegroup(
         "BUILD.tools",
         "classes_deploy.jar",
         "//src/tools/android/java/com/google/devtools/build/android/desugar:embedded_tools",
+        "//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:embedded_tools",
         "//src/tools/android/java/com/google/devtools/build/android/proto:srcs",
     ],
 )
diff --git a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD
index 42b4f1919a..e4070fe1a3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD
@@ -1,19 +1,11 @@
-package(default_visibility = ["//visibility:public"])
-
-android_library(
-    name = "incremental_stub_application",
-    srcs = [
-        "IncrementalClassLoader.java",
-        "StubApplication.java",
-    ],
-)
-
-android_library(
-    name = "incremental_split_stub_application",
-    srcs = ["Placeholder.java"],
-)
+package(default_visibility = ["//src/tools/android/java/com/google/devtools/build/android:__pkg__"])
 
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
 )
+
+filegroup(
+    name = "embedded_tools",
+    srcs = glob(["*.java"]) + ["BUILD.tools"],
+)
diff --git a/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD.tools
new file mode 100644
index 0000000000..1d74d1660e
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/incrementaldeployment/BUILD.tools
@@ -0,0 +1,14 @@
+package(default_visibility = ["//visibility:public"])
+
+android_library(
+    name = "incremental_stub_application",
+    srcs = [
+        "IncrementalClassLoader.java",
+        "StubApplication.java",
+    ],
+)
+
+android_library(
+    name = "incremental_split_stub_application",
+    srcs = ["Placeholder.java"],
+)
-- 
cgit v1.2.3