From 0424e5ba367152003cbf83293717d4dd0867e19c Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:19:19 -0400 Subject: [PATCH] [build] Remove unnecessary symbol exclusions (#7221) The symbol exporter in native-utils was updated and stopped exporting the excluded symbols. --- cameraserver/build.gradle | 13 ------------- cscore/build.gradle | 13 ------------- glass/build.gradle | 13 ------------- hal/build.gradle | 13 ------------- ntcore/build.gradle | 13 ------------- romiVendordep/build.gradle | 13 ------------- wpigui/build.gradle | 13 ------------- wpilibNewCommands/build.gradle | 13 ------------- wpilibc/build.gradle | 13 ------------- wpimath/build.gradle | 13 ------------- wpinet/build.gradle | 13 ------------- wpiutil/build.gradle | 13 ------------- xrpVendordep/build.gradle | 13 ------------- 13 files changed, 169 deletions(-) diff --git a/cameraserver/build.gradle b/cameraserver/build.gradle index 9075979b99..92925c6564 100644 --- a/cameraserver/build.gradle +++ b/cameraserver/build.gradle @@ -30,19 +30,6 @@ apply from: "${rootDir}/shared/opencv.gradle" nativeUtils.exportsConfigs { cameraserver { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/cscore/build.gradle b/cscore/build.gradle index 1cb49a2c93..5b2299548d 100644 --- a/cscore/build.gradle +++ b/cscore/build.gradle @@ -164,19 +164,6 @@ run { nativeUtils.exportsConfigs { cscore { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } cscoreJNI { x64SymbolFilter = symbolFilter diff --git a/glass/build.gradle b/glass/build.gradle index 33e90b9d25..551e6ffaef 100644 --- a/glass/build.gradle +++ b/glass/build.gradle @@ -69,19 +69,6 @@ tasks.withType(CppCompile) { nativeUtils.exportsConfigs { glass { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/hal/build.gradle b/hal/build.gradle index 8abdfdcebf..8af0ddad83 100644 --- a/hal/build.gradle +++ b/hal/build.gradle @@ -74,19 +74,6 @@ Action> symbolFilter = { symbols -> nativeUtils.exportsConfigs { hal { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } halJNI { x64SymbolFilter = symbolFilter diff --git a/ntcore/build.gradle b/ntcore/build.gradle index 510e5c183f..937c2d11b8 100644 --- a/ntcore/build.gradle +++ b/ntcore/build.gradle @@ -56,19 +56,6 @@ Action> symbolFilter = { symbols -> nativeUtils.exportsConfigs { ntcore { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } ntcoreJNI { x64SymbolFilter = symbolFilter diff --git a/romiVendordep/build.gradle b/romiVendordep/build.gradle index d2f0c0d0f7..b891c4de40 100644 --- a/romiVendordep/build.gradle +++ b/romiVendordep/build.gradle @@ -26,19 +26,6 @@ dependencies { nativeUtils.exportsConfigs { // Main library is just default empty. This will export everything romiVendordep { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/wpigui/build.gradle b/wpigui/build.gradle index 5ea5c40be8..959a821fe4 100644 --- a/wpigui/build.gradle +++ b/wpigui/build.gradle @@ -19,19 +19,6 @@ apply from: "${rootDir}/shared/config.gradle" nativeUtils.exportsConfigs { wpigui { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/wpilibNewCommands/build.gradle b/wpilibNewCommands/build.gradle index 89ada857bf..884c18b65c 100644 --- a/wpilibNewCommands/build.gradle +++ b/wpilibNewCommands/build.gradle @@ -28,19 +28,6 @@ sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java" nativeUtils.exportsConfigs { wpilibNewCommands { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index 3c9e8af704..ffe8a083b6 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -62,19 +62,6 @@ apply from: "${rootDir}/shared/googletest.gradle" nativeUtils.exportsConfigs { wpilibc { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 388923586a..cbc49c7df7 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -67,19 +67,6 @@ model { nativeUtils.exportsConfigs { wpimath { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] objectFilterClosure = { file -> return file.name.endsWith('.pb.obj') } diff --git a/wpinet/build.gradle b/wpinet/build.gradle index b1a5019a8b..546a4cc1d6 100644 --- a/wpinet/build.gradle +++ b/wpinet/build.gradle @@ -186,19 +186,6 @@ apply from: "${rootDir}/shared/jni/setupBuild.gradle" nativeUtils.exportsConfigs { wpinet { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index 90d22d2eff..5f7966100b 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -163,19 +163,6 @@ apply from: "${rootDir}/shared/jni/setupBuild.gradle" nativeUtils.exportsConfigs { wpiutil { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } } diff --git a/xrpVendordep/build.gradle b/xrpVendordep/build.gradle index 3ee9d0acef..21278f55de 100644 --- a/xrpVendordep/build.gradle +++ b/xrpVendordep/build.gradle @@ -26,19 +26,6 @@ dependencies { nativeUtils.exportsConfigs { // Main library is just default empty. This will export everything xrpVendordep { - x64ExcludeSymbols = [ - '_CT??_R0?AV_System_error', - '_CT??_R0?AVexception', - '_CT??_R0?AVfailure', - '_CT??_R0?AVruntime_error', - '_CT??_R0?AVsystem_error', - '_CTA5?AVfailure', - '_TI5?AVfailure', - '_CT??_R0?AVout_of_range', - '_CTA3?AVout_of_range', - '_TI3?AVout_of_range', - '_CT??_R0?AVbad_cast' - ] } }