diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle
index 4199a42fad..f18ff4c940 100644
--- a/vendor/gradle-plugin/build.gradle
+++ b/vendor/gradle-plugin/build.gradle
@@ -202,4 +202,26 @@ task addDependenciesFromNativeScriptPlugins {
 
         project.dependencies.add("implementation", jarFiles)
     }
-}
\ No newline at end of file
+}
+
+afterEvaluate {
+    def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
+    def generateR =  project.hasProperty("generateR") ? project.generateR : false
+    generateReleaseBuildConfig.enabled = generateBuildConfig
+    generateDebugBuildConfig.enabled = generateBuildConfig
+    generateReleaseResValues.enabled = generateR
+    generateDebugResValues.enabled = generateR
+}
+
+tasks.whenTaskAdded({ DefaultTask currentTask ->
+    if (currentTask.name == 'bundleRelease' || currentTask.name == 'bundleDebug') {
+        def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
+        def generateR =  project.hasProperty("generateR") ? project.generateR : false
+        if (!generateBuildConfig) {
+            currentTask.exclude '**/BuildConfig.class'
+        }
+        if (!generateR) {
+            currentTask.exclude '**/R.class', '**/R$*.class'
+        }
+    }
+})
diff --git a/vendor/gradle-plugin/gradle.properties b/vendor/gradle-plugin/gradle.properties
index 4385ddd9f4..849c4366ef 100644
--- a/vendor/gradle-plugin/gradle.properties
+++ b/vendor/gradle-plugin/gradle.properties
@@ -18,3 +18,6 @@ org.gradle.jvmargs=-Xmx16384M
 
 android.enableJetifier=true
 android.useAndroidX=true
+android.nonTransitiveRClass=true
+android.namespacedRClass=true
+android.enableSeparateRClassCompilation=true
\ No newline at end of file