diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
index d877932922..de7c50f49b 100644
--- a/shared/jni/setupBuild.gradle
+++ b/shared/jni/setupBuild.gradle
@@ -223,6 +223,9 @@ model {
                         nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
                     }
                 }
+                it.tasks.withType(CppCompile) {
+                    it.dependsOn generateProto
+                }
                 if (project.hasProperty('exeSplitSetup')) {
                     exeSplitSetup(it)
                 }
@@ -276,6 +279,9 @@ model {
                     nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
                 }
             }
+            it.tasks.withType(CppCompile) {
+                it.dependsOn generateProto
+            }
             if (project.hasProperty('exeSplitSetup')) {
                 exeSplitSetup(it)
             }