Pre-compile Android tools that are embedded in the Bazel binary.

This makes Android builds slightly faster and avoids the "Modification date is in the future" warnings by javac and removes the sources of devtools/common/options from the binary.

incrementaldeployment is not pre-compiled yet.

--
MOS_MIGRATED_REVID=106391321

8 files changed, 143 insertions, 22 deletions

diff --git a/src/BUILD b/src/BUILD
index 1003327590..ee73191569 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -66,30 +66,18 @@ genrule(
 genrule(
     name = "embedded_tools",
     srcs = [
+        ":create_embedded_tools.sh",
         "//tools:embedded_tools_srcs",
         "//third_party:srcs",
         "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
-        "//src/tools/android/java/com/google/devtools/build/android:srcs",
-        "//src/tools/android/java/com/google/devtools/build/android/idlclass:srcs",
+        "//src/tools/android/java/com/google/devtools/build/android: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/ziputils:srcs",
-        "//src/main/java/com/google/devtools/common/options:srcs",
+        "//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools",
         "//src/main/protobuf:srcs",
     ],
     outs = ["embedded_tools.zip"],
-    cmd = "\n".join([
-        "mkdir -p $(@D)/embedded-tools-zip",
-        "for i in $(SRCS); do",
-        "  mkdir -p $$(dirname $(@D)/embedded-tools-zip/$$i)",
-        "  cp $$i $$(dirname $(@D)/embedded-tools-zip/$$i)",
-        "done",
-        "touch $(@D)/embedded-tools-zip/WORKSPACE",
-        "mkdir -p $(@D)/embedded-tools-zip/tools/defaults",
-        "touch $(@D)/embedded-tools-zip/tools/defaults/BUILD",
-        "find $(@D)/embedded-tools-zip -exec touch -t 198001010000.00 '{}' ';'",
-        "P=$$PWD; (cd $(@D)/embedded-tools-zip && zip -qrD $$P/$@ *)",
-        "rm -fr $(@D)/embedded-tools-zip",
-    ]),
+    cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)",
 )
 
 [genrule(
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
new file mode 100755
index 0000000000..66f1ca2fe5
--- /dev/null
+++ b/src/create_embedded_tools.sh
@@ -0,0 +1,42 @@
+#!/bin/bash -eu
+
+# Copyright 2015 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.
+
+# This script is used to create the directory tree embedded into the Bazel
+# binary that is used as the default source for the @bazel_tools repository.
+# It shuffles around files compiled in other rules, then zips them up.
+
+OUTPUT="${PWD}/$1"
+shift
+
+TMP_DIR=${TMPDIR:+/tmp}
+PACKAGE_DIR="$(mktemp -d ${TMP_DIR%%/}/bazel.XXXXXXXX)"
+mkdir -p "${PACKAGE_DIR}"
+trap "rm -fr \"${PACKAGE_DIR}\"" EXIT
+
+for i in $*; do
+  OUTPUT_PATH=$(echo $i | sed 's_^.*bazel-out/[^/]*/bin/__')
+  mkdir -p "${PACKAGE_DIR}/$(dirname "${OUTPUT_PATH}")"
+  cp "$i" "${PACKAGE_DIR}/${OUTPUT_PATH}"
+done
+
+touch "${PACKAGE_DIR}/WORKSPACE"
+mkdir -p "${PACKAGE_DIR}/tools/defaults"
+touch "${PACKAGE_DIR}/tools/defaults/BUILD"
+for i in $(find "${PACKAGE_DIR}" -name BUILD.tools); do
+  mv "$i" "$(dirname "$i")/BUILD"
+done
+find "${PACKAGE_DIR}" -exec touch -t 198001010000.00 '{}' ';'
+(cd "${PACKAGE_DIR}" && zip -qrD "${OUTPUT}" *)
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 f51cbddc96..7d5d18991c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -3,8 +3,17 @@
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "classes_deploy.jar",
+    ],
+)
+
+java_binary(
+    name = "classes",
+    main_class = "does.not.exist",
+    runtime_deps = [":android_builder_lib"],
 )
 
 java_binary(
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
new file mode 100644
index 0000000000..8348c46006
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
@@ -0,0 +1,22 @@
+package(default_visibility = ["//visibility:public"])
+
+java_import(
+    name = "classes",
+    jars = [":classes_deploy.jar"],
+)
+
+java_binary(
+    name = "AndroidResourceProcessingAction",
+    main_class = "com.google.devtools.build.android.AndroidResourceProcessingAction",
+    runtime_deps = [
+        ":classes",
+    ],
+)
+
+java_binary(
+    name = "AarGeneratorAction",
+    main_class = "com.google.devtools.build.android.AarGeneratorAction",
+    runtime_deps = [
+        ":classes",
+    ],
+)
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 37e1ab311e..3ff8a76912 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,11 +1,19 @@
 filegroup(
-    name = "srcs",
-    # include this BUILD file for the default android tools repository
-    srcs = glob(["**"]),
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "classes_deploy.jar",
+    ],
     visibility = ["//src:__pkg__"],
 )
 
 java_binary(
+    name = "classes",
+    main_class = "does.not.exist",
+    runtime_deps = [":idlclass_lib"],
+)
+
+java_binary(
     name = "IdlClass",
     main_class = "com.google.devtools.build.android.idlclass.IdlClass",
     visibility = ["//visibility:public"],
diff --git a/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD.tools
new file mode 100644
index 0000000000..af785cc649
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/idlclass/BUILD.tools
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+java_import(
+    name = "classes",
+    jars = [":classes_deploy.jar"],
+)
+
+java_binary(
+    name = "IdlClass",
+    main_class = "com.google.devtools.build.android.idlclass.IdlClass",
+    runtime_deps = [":classes"],
+)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
index 9c4683404a..cc578b7397 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
@@ -9,6 +9,14 @@ filegroup(
     srcs = glob(["**"]),
 )
 
+filegroup(
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "all_deploy.jar",
+    ],
+)
+
 java_library(
     name = "ziputils_lib",
     srcs = glob(
@@ -68,3 +76,17 @@ java_binary(
         "//src/main/java/com/google/devtools/common/options",
     ],
 )
+
+java_binary(
+    name = "all",
+    srcs = [
+        "DexMapper.java",
+        "DexReducer.java",
+    ],
+    main_class = "does.not.exist",
+    deps = [
+        ":splitter_lib",
+        ":ziputils_lib",
+        "//src/main/java/com/google/devtools/common/options",
+    ],
+)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools
new file mode 100644
index 0000000000..e86fad0efd
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools
@@ -0,0 +1,18 @@
+package(default_visibility = ["//visibility:public"])
+
+java_import(
+    name = "classes",
+    jars = [":all_deploy.jar"],
+)
+
+java_binary(
+    name = "mapper",
+    main_class = "com.google.devtools.build.android.ziputils.DexMapper",
+    runtime_deps = [":classes"],
+)
+
+java_binary(
+    name = "reducer",
+    main_class = "com.google.devtools.build.android.ziputils.DexReducer",
+    runtime_deps = [":classes"],
+)