diff --git a/Android.bp b/Android.bp
index ba382399..c3ecd5be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,8 @@ android_app {
         "androidx.lifecycle_lifecycle-livedata-ktx",
         "androidx-constraintlayout_constraintlayout",
         "com.google.android.material_material",
+        "setupcompat",
+        "setupdesign",
         // storage backup lib
         "seedvault-lib-storage",
         // koin
diff --git a/app/build.gradle b/app/build.gradle
index d4134c83..64a570e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -162,7 +162,8 @@ gradle.projectsEvaluated {
         if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
             options.compilerArgs.addAll(['--release', '8'])
         }
-        options.compilerArgs.add('-Xbootclasspath/p:app/libs/android.jar:app/libs/libcore.jar')
+        options.compilerArgs.add('-Xbootclasspath/p:app/libs/android.jar:app/libs/libcore.jar:\
+            app/libs/setupcompat.jar:app/libs/setupdesign.jar')
     }
 }
 
diff --git a/app/libs/setupcompat.jar b/app/libs/setupcompat.jar
new file mode 100644
index 00000000..b93deb47
Binary files /dev/null and b/app/libs/setupcompat.jar differ
diff --git a/app/libs/setupdesign.jar b/app/libs/setupdesign.jar
new file mode 100644
index 00000000..ab41fb1e
Binary files /dev/null and b/app/libs/setupdesign.jar differ
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 607af4e0..ce510a8a 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -21,6 +21,10 @@ ext.aosp_libs = fileTree(include: [
     'android.jar',
     // out/target/common/obj/JAVA_LIBRARIES/core-libart.com.android.art_intermediates/classes.jar
     'libcore.jar',
+    // out/target/product/device/obj/JAVA_LIBRARIES/setupcompat_intermediates/javalib.jar
+    'setupcompat.jar',
+    // out/target/product/device/obj/JAVA_LIBRARIES/setupdesign_intermediates/javalib.jar
+    'setupdesign.jar',
 ], dir: "$projectDir/app/libs")
 
 ext.kotlin_libs = [