2 files changed, 17 insertions, 1 deletions
diff --git a/java/com/android/dialer/binary/aosp/AospDialerApplication.java b/java/com/android/dialer/binary/aosp/AospDialerApplication.java
index f657a3987..4ca94e277 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerApplication.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerApplication.java
@@ -26,5 +26,10 @@ import com.android.dialer.inject.ContextModule;
  */
 public class AospDialerApplication extends DialerApplication {
 
-
+  /** Returns a new instance of the root component for the AOSP Dialer. */
+  @Override
+  @NonNull
+  protected Object buildRootComponent() {
+    return DaggerAospDialerRootComponent.builder().contextModule(new ContextModule(this)).build();
+  }
 }
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
index 8628e90c2..54fedc2be 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -27,4 +27,15 @@ import dagger.Component;
 import javax.inject.Singleton;
 
 /** Root component for the AOSP Dialer application. */
+@Singleton
+@Component(
+  modules = {
+    ContextModule.class,
+    SimulatorModule.class,
+    StubCallLocationModule.class,
+    StubEnrichedCallModule.class,
+    StubMapsModule.class,
+    VoicemailModule.class
+  }
+)
 public interface AospDialerRootComponent extends BaseDialerRootComponent {}