fix issue with platform binaries not building

PhotonVision · Nov 19, 2023 · 7a4cdfc · 7a4cdfc
1 parent 08b7938
commit 7a4cdfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/photon-lib/build.gradle b/photon-lib/build.gradle
@@ -60,7 +60,7 @@ dependencies {
 nativeUtils {
     exportsConfigs {
         // Main library is just default empty. This will export everything
-        Photon {}
+        photonlib {}
     }
 }
 

diff --git a/shared/setupBuild.gradle b/shared/setupBuild.gradle
@@ -7,7 +7,7 @@ apply from: "${rootDir}/shared/javacommon.gradle"
 
 model {
     components {
-        "${nativeName}Base"(NativeLibrarySpec) {
+        "${nativeName}"(NativeLibrarySpec) {
             sources {
                 cpp {
                     source {
@@ -23,7 +23,7 @@ model {
 
             binaries.all {
                 if(project.hasProperty('includePhotonTargeting')) {
-                    lib project: ':photon-targeting', library: 'photontargetingBase', linkage: 'shared'
+                    lib project: ':photon-targeting', library: 'photontargeting', linkage: 'shared'
                 }
             }
 
@@ -35,7 +35,7 @@ model {
     testSuites {
         "${nativeName}Test"(GoogleTestTestSuiteSpec) {
             for(NativeComponentSpec c : $.components) {
-                if ("${nativeName}Base" == c.name) {
+                if ("${nativeName}" == c.name) {
                     testing c
                     break
                 }
@@ -54,7 +54,7 @@ model {
 
             binaries.all {
                 if(project.hasProperty('includePhotonTargeting')) {
-                    lib project: ':photon-targeting', library: 'photontargetingBase', linkage: 'shared'
+                    lib project: ':photon-targeting', library: 'photontargeting', linkage: 'shared'
                 }
             }