From ea9bb651a393f6a999c5b60e25e369e9b5cbd200 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Wed, 30 Oct 2019 21:28:45 -0700
Subject: [PATCH] Remove accidental OpenCV link from wpilibc shared library
 (#2013)

---
 wpilibc/build.gradle | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle
index 5f93f7ec6f..b1a18c8c0a 100644
--- a/wpilibc/build.gradle
+++ b/wpilibc/build.gradle
@@ -50,18 +50,6 @@ gradle.taskGraph.addTaskExecutionGraphListener { graph ->
     }
 }
 
-ext {
-    sharedCvConfigs = [wpilibc    : [],
-                       wpilibcBase: [],
-                       wpilibcDev : [],
-                       wpilibcTest: []]
-    staticCvConfigs = [:]
-    useJava = false
-    useCpp = true
-}
-
-apply from: "${rootDir}/shared/opencv.gradle"
-
 project(':').libraryBuild.dependsOn build
 
 ext {
@@ -147,6 +135,7 @@ model {
                 } else {
                     lib project: ':cscore', library: 'cscore', linkage: 'shared'
                     lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
+                    nativeUtils.useRequiredLibrary(it, 'opencv_shared')
                 }
 
             }
@@ -174,6 +163,7 @@ model {
                 project(':hal').addHalDependency(it, 'shared')
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
                 lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
+                nativeUtils.useRequiredLibrary(it, 'opencv_shared')
             }
         }
     }
@@ -219,6 +209,7 @@ model {
             project(':hal').addHalDependency(it, 'shared')
             lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
             lib project: ':cameraserver', library: 'cameraserver', linkage: 'shared'
+            nativeUtils.useRequiredLibrary(it, 'opencv_shared')
             lib library: nativeName, linkage: 'shared'
         }
     }