diff --git a/app/build.gradle b/app/build.gradle
index 39ac491e60..122304da24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -613,6 +613,7 @@ android {
         viewBinding true
         prefab true // enable prefab support for various SDK AAR
         dataBinding true
+        buildConfig true
     }
 
     lint {
diff --git a/build.gradle b/build.gradle
index a2ebd45131..4f2ccda91d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath "org.mozilla.telemetry:glean-gradle-plugin:56.1.0"
         classpath "com.android.tools.build:gradle:$versions.android_gradle_plugin"
-        classpath 'com.android.tools:r8:8.5.35'
+        classpath 'com.android.tools:r8:8.7.14'
         classpath "$deps.kotlin.plugin"
         classpath 'com.huawei.agconnect:agcp:1.9.1.301'
 
diff --git a/gradle.properties b/gradle.properties
index a6f549e822..8602b39448 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,6 +24,5 @@ android.injected.testOnly=false
 android.useAndroidX=true
 android.enableJetifier=true
 
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false