commit da9f5bdf164f8d38c4022f755c9c0ead73338e7a
author Aurimas Liutikas <aurimas@google.com> Wed May 12 23:38:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 12 23:38:40 2021 +0000
tree 960edeb544f68559c068d85754598f9450c5a9fe
parent 44563555352ed5260ac917880087eee8a102279b
parent 367408b057fd78df809109a1a05cd05cd47d435d

Merge "Revert "Add additional files to hilt_android"" am: 3ba66ad179 am: 72dacad246 am: 0cd6a85513 am: 367408b057

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705750

Change-Id: Ia227a40eab2454397dede6b1c41cb18192a41989

Android.bp

diff --git a/Android.bp b/Android.bp
index 7573ab7..1bdbd1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -236,17 +236,11 @@
         "java/dagger/hilt/android/internal/migration/*.java",
         "java/dagger/hilt/android/internal/modules/*.java",
         "java/dagger/hilt/android/lifecycle/*.java",
-        "java/dagger/hilt/internal/aggregatedroot/*.java",
-        "java/dagger/hilt/internal/processedrootsentinel/*.java",
     ],
     manifest: "java/dagger/hilt/android/AndroidManifest.xml",
     static_libs: [
-        "androidx.activity_activity",
         "androidx.annotation_annotation",
         "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
         "jsr305",
         "jsr330",
         "dagger2",
@@ -389,7 +383,7 @@
 java_plugin {
     name: "hilt_uninstall_modules_processor",
     generates_api: true,
-    processor_class: "dagger.hilt.processor.internal.uninstallmodules.UninstallModulesProcessor",
+    processor_class: "dagger.hilt.android.processor.internal.uninstallmodules.UninstallModulesProcessor",
 }
 
 java_library_host {