Skip to content

Commit 8de5295

Browse files
committed
use wpilib strat for including native libraries
1 parent 254ed36 commit 8de5295

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

photon-core/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,24 @@ dependencies {
2828
wpilibNatives wpilibTools.deps.wpilib("hal")
2929
wpilibNatives wpilibTools.deps.wpilibOpenCv("frc" + openCVYear, wpi.versions.opencvVersion.get())
3030

31-
// Zip
31+
// These stay as implementation dependencies since they don't have native code that gets packaged
3232
implementation 'org.zeroturnaround:zt-zip:1.14'
33-
3433
implementation "org.xerial:sqlite-jdbc:3.41.0.0"
35-
implementation("org.photonvision:rknn_jni-jni:$rknnVersion:linuxarm64") {
34+
35+
// The JNI libraries use wpilibNatives, the java libraries use implementation
36+
wpilibNatives("org.photonvision:rknn_jni-jni:$rknnVersion:$wpilibNativeName") {
3637
transitive = false
3738
}
3839
implementation("org.photonvision:rknn_jni-java:$rknnVersion") {
3940
transitive = false
4041
}
41-
implementation("org.photonvision:rubik_jni-jni:$rubikVersion:linuxarm64") {
42+
wpilibNatives("org.photonvision:rubik_jni-jni:$rubikVersion:$wpilibNativeName") {
4243
transitive = false
4344
}
4445
implementation("org.photonvision:rubik_jni-java:$rubikVersion") {
4546
transitive = false
4647
}
47-
implementation("org.photonvision:photon-libcamera-gl-driver-jni:$libcameraDriverVersion:linuxarm64") {
48+
wpilibNatives("org.photonvision:photon-libcamera-gl-driver-jni:$libcameraDriverVersion:$wpilibNativeName") {
4849
transitive = false
4950
}
5051
implementation "org.photonvision:photon-libcamera-gl-driver-java:$libcameraDriverVersion"

0 commit comments

Comments
 (0)