mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[wpiutil] Reenable jni check task (#4606)
New option was added to JNI plugin to allow skipping specific symbols. This let us generally reenable the check task in wpiutil.
This commit is contained in:
@@ -16,7 +16,7 @@ plugins {
|
||||
id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2023.0.0'
|
||||
id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2'
|
||||
id 'edu.wpi.first.NativeUtils' apply false
|
||||
id 'edu.wpi.first.GradleJni' version '1.0.0'
|
||||
id 'edu.wpi.first.GradleJni' version '1.1.0'
|
||||
id 'edu.wpi.first.GradleVsCode'
|
||||
id 'idea'
|
||||
id 'visual-studio'
|
||||
|
||||
@@ -104,6 +104,10 @@ model {
|
||||
baseName = nativeName + 'jni'
|
||||
}
|
||||
|
||||
if (project.hasProperty('skipJniSymbols')) {
|
||||
checkSkipSymbols = skipJniSymbols
|
||||
}
|
||||
|
||||
enableCheckTask !project.hasProperty('skipJniCheck')
|
||||
javaCompileTasks << compileJava
|
||||
jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.roborio)
|
||||
@@ -148,6 +152,10 @@ model {
|
||||
baseName = nativeName + 'jni'
|
||||
}
|
||||
|
||||
if (project.hasProperty('skipJniSymbols')) {
|
||||
checkSkipSymbols = skipJniSymbols
|
||||
}
|
||||
|
||||
enableCheckTask !project.hasProperty('skipJniCheck')
|
||||
javaCompileTasks << compileJava
|
||||
jniCrossCompileOptions << JniCrossCompileOptions(nativeUtils.wpi.platforms.roborio)
|
||||
|
||||
@@ -2,7 +2,9 @@ apply from: "${rootDir}/shared/resources.gradle"
|
||||
|
||||
ext {
|
||||
noWpiutil = true
|
||||
skipJniCheck = true
|
||||
skipJniSymbols = [
|
||||
'Java_edu_wpi_first_util_CombinedRuntimeLoader_setDllDirectory'
|
||||
]
|
||||
baseId = 'wpiutil'
|
||||
groupId = 'edu.wpi.first.wpiutil'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user