Omit auto-common from the compiler since it's shaded. Do the same

for dagger-android-processor since it also has a dep on auto-common.

Also sort the order of dependencies in the pom so it's easier to
detect diffs

Fixes https://github.com/google/dagger/issues/646

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=152506865

1 files changed, 20 insertions, 17 deletions

diff --git a/BUILD b/BUILD
index be3588f0a..9dcfc2168 100644
--- a/BUILD
+++ b/BUILD
@@ -39,23 +39,6 @@ java_library(
     ],
 )
 
-load("//tools:jarjar.bzl", "jarjar_library")
-
-genrule(
-    name = "rules_file",
-    outs = ["rules_file.txt"],
-    cmd = "echo \"rule com.google.auto.common.** dagger.shaded.auto.common.@1\" > $@",
-)
-
-jarjar_library(
-    name = "shaded_compiler",
-    rules_file = ":rules_file.txt",
-    deps = [
-        "//compiler",
-        "@com_google_auto_auto_common//jar",
-    ],
-)
-
 android_library(
     name = "android",
     exported_plugins = ["//java/dagger/android/processor:plugin"],
@@ -70,6 +53,26 @@ android_library(
     ],
 )
 
+load("//tools:jarjar.bzl", "jarjar_library")
+
+jarjar_library(
+    name = "shaded_compiler",
+    rules_file = "shade_rules.txt",
+    deps = [
+        "//compiler",
+        "@com_google_auto_auto_common//jar",
+    ],
+)
+
+jarjar_library(
+    name = "shaded_android_processor",
+    rules_file = "shade_rules.txt",
+    deps = [
+        "//java/dagger/android/processor",
+        "@com_google_auto_auto_common//jar",
+    ],
+)
+
 load("//tools:javadoc.bzl", "javadoc_library")
 
 # coalesced javadocs used for the gh-pages site