Update native utils and fix load bugs
This commit is contained in:
parent
3915aadeed
commit
9ca273c29a
@ -3,7 +3,7 @@ plugins {
|
|||||||
id 'java'
|
id 'java'
|
||||||
id 'google-test'
|
id 'google-test'
|
||||||
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
||||||
id 'edu.wpi.first.NativeUtils' version '2023.11.1'
|
id 'edu.wpi.first.NativeUtils' version '2024.0.0'
|
||||||
id 'edu.wpi.first.GradleJni' version '1.0.0'
|
id 'edu.wpi.first.GradleJni' version '1.0.0'
|
||||||
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
|
id 'edu.wpi.first.GradleVsCode' version '1.3.0'
|
||||||
}
|
}
|
||||||
|
4
src/main/java/com/vendor/jni/VendorJNI.java
vendored
4
src/main/java/com/vendor/jni/VendorJNI.java
vendored
@ -24,7 +24,7 @@ public class VendorJNI {
|
|||||||
static {
|
static {
|
||||||
if (Helper.getExtractOnStaticLoad()) {
|
if (Helper.getExtractOnStaticLoad()) {
|
||||||
try {
|
try {
|
||||||
loader = new RuntimeLoader<>("Vendor", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class);
|
loader = new RuntimeLoader<>("VendorDriver", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class);
|
||||||
loader.loadLibrary();
|
loader.loadLibrary();
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
@ -42,7 +42,7 @@ public class VendorJNI {
|
|||||||
if (libraryLoaded) {
|
if (libraryLoaded) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
loader = new RuntimeLoader<>("VendorJNI", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class);
|
loader = new RuntimeLoader<>("VendorDriver", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class);
|
||||||
loader.loadLibrary();
|
loader.loadLibrary();
|
||||||
libraryLoaded = true;
|
libraryLoaded = true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user