diff --git a/common.gradle b/common.gradle
index 0e2d7f801..93d81c430 100644
--- a/common.gradle
+++ b/common.gradle
@@ -71,9 +71,6 @@ android {
     }
 
     buildFeatures {
-        // Disable unused AGP features
-        aidl false
-        renderScript false
         resValues false
         shaders false
         buildConfig true
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 2a67ba06f..459cc69e8 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -11,7 +11,6 @@ android {
 
     namespace = "eu.kanade.tachiyomi.extension.core"
 
-    @Suppress("UnstableApiUsage")
     sourceSets {
         named("main") {
             manifest.srcFile("AndroidManifest.xml")
@@ -19,9 +18,8 @@ android {
         }
     }
 
-    libraryVariants.all {
-        generateBuildConfigProvider?.configure {
-            enabled = false
-        }
+    buildFeatures {
+        resValues = false
+        shaders = false
     }
 }