commit 3880ddc695f539c9fa185cc73bb0049b6cce0b6d
author Tobias Werth <twerth@google.com> Fri Apr 12 07:03:43 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 12 07:04:45 2019 -0700
tree e440c1fdfc281dc87e831fdf74a1c163a4a5ff8f
parent ab06291504ae3031eeb70b3e456c5330173600b8

Depend on android_common_lite.

This is a follow-up on 0e3db34b91d72bc4982d4d5ff2e8b0ebd7a82b30.

Bazel's binary size is now down to ~68MB.

RELNOTES: None

Closes #8019.

PiperOrigin-RevId: 243257410

src/jdeps_modules.golden

diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden
index c1d235a..0abe2d2 100644
--- a/src/jdeps_modules.golden
+++ b/src/jdeps_modules.golden
@@ -8,7 +8,6 @@
 java.security.jgss
 java.sql
 java.xml
-jdk.compiler
 jdk.management
 jdk.sctp
 jdk.unsupported

src/main/java/com/google/devtools/build/lib/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index d4a86c7..34a6a8d 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -784,7 +784,7 @@
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_java_proto",
-        "//third_party:android_common_25_0_0",
+        "//third_party:android_common_25_0_0_lite",
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -1123,7 +1123,7 @@
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:android_deploy_info_java_proto",
-        "//third_party:android_common_25_0_0",
+        "//third_party:android_common_25_0_0_lite",
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",

src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
index 9dcf277..eac81c6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
-import com.android.annotations.VisibleForTesting;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext;