diff --git a/app/build.gradle b/app/build.gradle
index efa48f5b99c..3891f328622 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,6 +98,7 @@ android {
     }
     buildFeatures {
         aidl true
+        buildConfig true
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index d5e3c758a2c..75ed3a86e3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,6 @@
 android.useAndroidX=true
 android.enableJetifier=false
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 
 org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/libcore/compat/build.gradle b/libcore/compat/build.gradle
index 24cd36f85bd..248b07fe3f7 100644
--- a/libcore/compat/build.gradle
+++ b/libcore/compat/build.gradle
@@ -24,6 +24,9 @@ android {
             includeAndroidResources = true
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
diff --git a/libcore/io/build.gradle b/libcore/io/build.gradle
index dd5af3ffc2f..95509bf9d53 100644
--- a/libcore/io/build.gradle
+++ b/libcore/io/build.gradle
@@ -20,6 +20,7 @@ android {
     }
     buildFeatures {
         aidl true
+        buildConfig true
     }
 }