diff --git a/hal/build.gradle b/hal/build.gradle
index cf6cd0d17c..03d07a0180 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -100,6 +100,11 @@ ext {
             }
         }
     }
+    exeSplitSetup = {
+        if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
+            nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
+        }
+    }
 }
 
 apply from: "${rootDir}/shared/jni/setupBuild.gradle"
diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
index 10d1740d09..2110395073 100644
--- a/shared/jni/setupBuild.gradle
+++ b/shared/jni/setupBuild.gradle
@@ -201,8 +201,8 @@ model {
                     lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
                     lib project: ':wpiutil', library: 'wpiutilJNIShared', linkage: 'shared'
                 }
-                if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
-                    nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
+                if (project.hasProperty('exeSplitSetup')) {
+                    exeSplitSetup(it)
                 }
             }
         }
@@ -236,9 +236,9 @@ model {
             lib library: nativeName, linkage: 'shared'
             if (!project.hasProperty('noWpiutil')) {
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
-                if (nativeName == 'hal' && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
-                    nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
-                }
+            }
+            if (project.hasProperty('exeSplitSetup')) {
+                exeSplitSetup(it)
             }
         }
     }