diff --git a/build.gradle b/build.gradle
index dbd07f1030..5344d4b640 100644
--- a/build.gradle
+++ b/build.gradle
@@ -211,6 +211,10 @@ android {
         }
     }
 
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+    }
+
     dependenciesInfo {
         includeInApk = false
         includeInBundle = false
@@ -358,6 +362,8 @@ dependencies {
     // Required for AOSP to compile. This is already included in the sysui_shared.jar
     withoutQuickstepImplementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'plugin_core.jar')
 
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.preference:preference-ktx:1.2.1"