Move dagger deps to libs/m2

Change-Id: I571657ba16117bf9440ae1aee822b901bf901931
Test: cd packages/app/TV; mm  javac-check  RUN_ERROR_PRONE=true

11 files changed, 43 insertions, 9 deletions

diff --git a/libs/Android.bp b/libs/Android.bp
index 60e9362f..da81e3a8 100644
--- a/libs/Android.bp
+++ b/libs/Android.bp
@@ -115,15 +115,15 @@ android_library_import {
 java_import_host {
     name: "tv-lib-dagger-compiler-import",
     jars: [
-        "dagger-compiler-2.15.jar",
-        "dagger-producers-2.15.jar",
-        "dagger-spi-2.15.jar",
+        "m2/dagger-compiler-2.15.jar",
+        "m2/dagger-producers-2.15.jar",
+        "m2/dagger-spi-2.15.jar",
     ],
 }
 
 java_import {
     name: "tv-lib-dagger",
-    jars: ["dagger-2.15.jar"],
+    jars: ["m2/dagger-2.15.jar"],
     host_supported: true,
     sdk_version: "current",
 }
@@ -144,16 +144,16 @@ java_plugin {
 
 android_library_import {
     name: "tv-lib-dagger-android",
-    aars: ["dagger-android-2.15.aar"],
+    aars: ["m2/dagger-android-2.15.aar"],
     sdk_version: "current",
 }
 
 java_import_host {
     name: "tv-lib-dagger-android-processor-import",
     jars: [
-        "dagger-android-jarimpl-2.15.jar",
-        "dagger-android-processor-2.15.jar",
-        "dagger-android-support-jarimpl-2.15.jar",
+        "m2/dagger-android-jarimpl-2.15.jar",
+        "m2/dagger-android-processor-2.15.jar",
+        "m2/dagger-android-support-jarimpl-2.15.jar",
     ],
 }
 
diff --git a/libs/dagger-2.15.jar b/libs/m2/dagger-2.15.jar
index 6d766885..6d766885 100644
--- a/libs/dagger-2.15.jar
+++ b/libs/m2/dagger-2.15.jar
diff --git a/libs/dagger-android-2.15.aar b/libs/m2/dagger-android-2.15.aar
index 430294a2..430294a2 100644
--- a/libs/dagger-android-2.15.aar
+++ b/libs/m2/dagger-android-2.15.aar
diff --git a/libs/dagger-android-jarimpl-2.15.jar b/libs/m2/dagger-android-jarimpl-2.15.jar
index 7f7cd459..7f7cd459 100644
--- a/libs/dagger-android-jarimpl-2.15.jar
+++ b/libs/m2/dagger-android-jarimpl-2.15.jar
diff --git a/libs/dagger-android-processor-2.15.jar b/libs/m2/dagger-android-processor-2.15.jar
index 3c7ac054..3c7ac054 100644
--- a/libs/dagger-android-processor-2.15.jar
+++ b/libs/m2/dagger-android-processor-2.15.jar
diff --git a/libs/dagger-android-support-jarimpl-2.15.jar b/libs/m2/dagger-android-support-jarimpl-2.15.jar
index d0ea01a7..d0ea01a7 100644
--- a/libs/dagger-android-support-jarimpl-2.15.jar
+++ b/libs/m2/dagger-android-support-jarimpl-2.15.jar
diff --git a/libs/dagger-compiler-2.15.jar b/libs/m2/dagger-compiler-2.15.jar
index e73110f6..e73110f6 100644
--- a/libs/dagger-compiler-2.15.jar
+++ b/libs/m2/dagger-compiler-2.15.jar
diff --git a/libs/dagger-producers-2.15.jar b/libs/m2/dagger-producers-2.15.jar
index f1dbb07a..f1dbb07a 100644
--- a/libs/dagger-producers-2.15.jar
+++ b/libs/m2/dagger-producers-2.15.jar
diff --git a/libs/dagger-spi-2.15.jar b/libs/m2/dagger-spi-2.15.jar
index 6e3156a9..6e3156a9 100644
--- a/libs/dagger-spi-2.15.jar
+++ b/libs/m2/dagger-spi-2.15.jar
diff --git a/libs/pom.xml b/libs/pom.xml
index cc2fc257..532d7487 100644
--- a/libs/pom.xml
+++ b/libs/pom.xml
@@ -27,11 +27,44 @@
         Live TV Dependencies
     </description>
 
+
+    <repositories>
+        <repository>
+            <id>google</id>
+            <name>Google</name>
+            <url>https://maven.google.com</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.google.auto.factory</groupId>
             <artifactId>auto-factory</artifactId>
             <version>1.0-beta6</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger</artifactId>
+            <version>2.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger-compiler</artifactId>
+            <version>2.15</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.google.dagger/dagger-android -->
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger-android</artifactId>
+            <version>2.15</version>
+            <type>aar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger-android-processor</artifactId>
+            <version>2.15</version>
+        </dependency>
     </dependencies>
+
+
 </project>
diff --git a/libs/updateDeps.sh b/libs/updateDeps.sh
index 3abe87f8..766ceedb 100755
--- a/libs/updateDeps.sh
+++ b/libs/updateDeps.sh
@@ -21,7 +21,8 @@ git rm ${m2_dir}/*
 mvn \
   -DoutputDirectory=${m2_dir} \
   -DincludeScope=runtime \
-  -DexcludeArtifactIds=google-java-format,javax.inject \
+  -DexcludeArtifactIds=google-java-format,javax.inject,jsr250-api,checker-compat-qual \
+  -DexcludeGroupIds=com.android.support \
   dependency:copy-dependencies
 
 git add ${m2_dir}/*