Rename folder with native binaries from 'lib' to 'lib-native'

jjohannes · jjohannes · commit 0ef1b17d9d3f · 2025-09-03T15:36:29.000+02:00
A folder with a '-' is not considered a package by Java and is then
allowed to exist in multiple Jars without causing a split-package
issue.

Signed-off-by: Jendrik Johannes &lt;jendrik.johannes@gmail.com&gt;
diff --git a/arithmetic/build.gradle b/arithmetic/build.gradle
@@ -32,32 +32,32 @@ dependencies {
 }
 task macAarch64LibCopy(type: Copy) {
     from 'build/darwin-aarch64/lib/libeth_arithmetic.dylib'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macAarch64LibCopy
 
 
 task macLibCopy(type: Copy) {
     from 'build/darwin-x86-64/lib/libeth_arithmetic.dylib'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
     from 'build/linux-gnu-x86_64/lib/libeth_arithmetic.so'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
     from 'build/linux-gnu-aarch64/lib/libeth_arithmetic.so'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
     from 'build/linux-gnu-riscv64/lib/libeth_arithmetic.so'
-    into 'build/resources/main/lib/riscv64'
+    into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 
diff --git a/blake2bf/build.gradle b/blake2bf/build.gradle
@@ -28,27 +28,27 @@ dependencies {
 
 task macAarch64LibCopy(type: Copy) {
   from 'build/darwin-aarch64/lib/libblake2bf.dylib'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 
 processResources.dependsOn macAarch64LibCopy
 
 task macLibCopy(type: Copy) {
   from 'build/darwin-x86-64/lib/libblake2bf.dylib'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
   from 'build/linux-gnu-x86_64/lib/libblake2bf.so'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
   from 'build/linux-gnu-aarch64/lib/libblake2bf.so'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
diff --git a/boringssl/build.gradle b/boringssl/build.gradle
@@ -33,31 +33,31 @@ dependencies {
 
 task macArmLibCopy(type: Copy) {
     from 'build/darwin-aarch64/lib/libboringssl_precompiles.dylib'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 task macLibCopy(type: Copy) {
     from 'build/darwin-x86-64/lib/libboringssl_precompiles.dylib'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
     from 'build/linux-gnu-x86_64/lib/libboringssl_precompiles.so'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
     from 'build/linux-gnu-aarch64/lib/libboringssl_precompiles.so'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
     from 'build/linux-gnu-riscv64/lib/libboringssl_precompiles.so'
-    into 'build/resources/main/lib/riscv64'
+    into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 
diff --git a/common/src/main/java/org/hyperledger/besu/nativelib/common/BesuNativeLibraryLoader.java b/common/src/main/java/org/hyperledger/besu/nativelib/common/BesuNativeLibraryLoader.java
@@ -122,6 +122,8 @@ private static String safeArchLib(String platformNativeLibraryName) {
     if (Arrays.asList(X86_VARIANTS).contains(arch)) {
       arch = "x86-64";
     }
-    return String.format("lib/%s/%s", arch, platformNativeLibraryName );
+    // It is important that the folder 'lib-native' contains a '-' such that it is only
+    // folder and not a 'java package' to wich visibility rules may be applied by JPMS.
+    return String.format("lib-native/%s/%s", arch, platformNativeLibraryName );
   }
 }
diff --git a/constantine/build.gradle b/constantine/build.gradle
@@ -28,23 +28,23 @@ tasks.withType(JavaCompile) {
 
 task macArmLibCopy(type: Copy) {
     from "build/darwin-aarch64/lib/libconstantinebindings.dylib"
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 
 task macLibCopy(type: Copy) {
     from "build/darwin-x86-64/lib/libconstantinebindings.dylib"
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 
 task linuxLibCopy(type: Copy) {
     from "build/linux-gnu-x86_64/lib/libconstantinebindings.so"
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 
 }
 
 task linuxArm64LibCopy(type: Copy) {
     from "build/linux-gnu-aarch64/lib/libconstantinebindings.so"
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 
 processResources.dependsOn macArmLibCopy, macLibCopy, linuxLibCopy, linuxArm64LibCopy
diff --git a/gnark/build.gradle b/gnark/build.gradle
@@ -34,39 +34,39 @@ task macArmLibCopy(type: Copy) {
     from 'build/darwin-aarch64/lib/libgnark_jni.dylib'
     from 'build/darwin-aarch64/lib/libgnark_eip_2537.dylib'
     from 'build/darwin-aarch64/lib/libgnark_eip_196.dylib'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 task macLibCopy(type: Copy) {
     from 'build/darwin-x86-64/lib/libgnark_jni.dylib'
     from 'build/darwin-x86-64/lib/libgnark_eip_2537.dylib'
     from 'build/darwin-x86-64/lib/libgnark_eip_196.dylib'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
     from 'build/linux-gnu-x86_64/lib/libgnark_jni.so'
     from 'build/linux-gnu-x86_64/lib/libgnark_eip_2537.so'
     from 'build/linux-gnu-x86_64/lib/libgnark_eip_196.so'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
     from 'build/linux-gnu-aarch64/lib/libgnark_jni.so'
     from 'build/linux-gnu-aarch64/lib/libgnark_eip_2537.so'
     from 'build/linux-gnu-aarch64/lib/libgnark_eip_196.so'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
     from 'build/linux-gnu-riscv64/lib/libgnark_jni.so'
     from 'build/linux-gnu-riscv64/lib/libgnark_eip_2537.so'
     from 'build/linux-gnu-riscv64/lib/libgnark_eip_196.so'
-    into 'build/resources/main/lib/riscv64'
+    into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 
diff --git a/ipa-multipoint/build.gradle b/ipa-multipoint/build.gradle
@@ -44,31 +44,31 @@ sourceSets {
 
 task macArmLibCopy(type: Copy) {
   from 'build/darwin-aarch64/lib/libipa_multipoint_jni.dylib'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 task macLibCopy(type: Copy) {
   from 'build/darwin-x86-64/lib/libipa_multipoint_jni.dylib'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
   from 'build/linux-gnu-x86_64/lib/libipa_multipoint_jni.so'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
   from 'build/linux-gnu-aarch64/lib/libipa_multipoint_jni.so'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
   from 'build/linux-gnu-riscv64/lib/libipa_multipoint_jni.so'
-  into 'build/resources/main/lib/riscv64'
+  into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 
diff --git a/secp256k1/build.gradle b/secp256k1/build.gradle
@@ -33,62 +33,62 @@ dependencies {
 
 task macArmLibCopy(type: Copy) {
   from 'build/darwin-aarch64/lib/libsecp256k1.dylib'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 task macLibCopy(type: Copy) {
   from 'build/darwin-x86-64/lib/libsecp256k1.dylib'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
   from 'build/linux-gnu-x86_64/lib/libsecp256k1.so'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
   from 'build/linux-gnu-aarch64/lib/libsecp256k1.so'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
   from 'build/linux-gnu-riscv64/lib/libsecp256k1.so'
-  into 'build/resources/main/lib/riscv64'
+  into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 
 // JNI library copy tasks
 task macArmJNILibCopy(type: Copy) {
   from 'build/darwin-aarch64/lib/libsecp256k1_ecrecover.dylib'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmJNILibCopy
 
 task macJNILibCopy(type: Copy) {
   from 'build/darwin-x86-64/lib/libsecp256k1_ecrecover.dylib'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macJNILibCopy
 
 task linuxJNILibCopy(type: Copy) {
   from 'build/linux-gnu-x86_64/lib/libsecp256k1_ecrecover.so'
-  into 'build/resources/main/lib/x86-64'
+  into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxJNILibCopy
 
 task linuxArm64JNILibCopy(type: Copy) {
   from 'build/linux-gnu-aarch64/lib/libsecp256k1_ecrecover.so'
-  into 'build/resources/main/lib/aarch64'
+  into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64JNILibCopy
 
 task linuxRiscv64JNILibCopy(type: Copy) {
   from 'build/linux-gnu-riscv64/lib/libsecp256k1_ecrecover.so'
-  into 'build/resources/main/lib/riscv64'
+  into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64JNILibCopy
 
diff --git a/secp256r1/build.gradle b/secp256r1/build.gradle
@@ -40,35 +40,35 @@ tasks.named('compileTestJava').configure {
 task macArmLibCopy(type: Copy) {
     from 'besu-native-ec/release/darwin-aarch64/libbesu_native_ec.dylib'
     from 'besu-native-ec/release/darwin-aarch64/libbesu_native_ec_crypto.dylib'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn macArmLibCopy
 
 task macLibCopy(type: Copy) {
     from 'besu-native-ec/release/darwin-x86-64/libbesu_native_ec.dylib'
     from 'besu-native-ec/release/darwin-x86-64/libbesu_native_ec_crypto.dylib'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn macLibCopy
 
 task linuxLibCopy(type: Copy) {
     from 'besu-native-ec/release/linux-gnu-x86_64/libbesu_native_ec.so'
     from 'besu-native-ec/release/linux-gnu-x86_64/libbesu_native_ec_crypto.so'
-    into 'build/resources/main/lib/x86-64'
+    into 'build/resources/main/lib-native/x86-64'
 }
 processResources.dependsOn linuxLibCopy
 
 task linuxArm64LibCopy(type: Copy) {
     from 'besu-native-ec/release/linux-gnu-aarch64/libbesu_native_ec.so'
     from 'besu-native-ec/release/linux-gnu-aarch64/libbesu_native_ec_crypto.so'
-    into 'build/resources/main/lib/aarch64'
+    into 'build/resources/main/lib-native/aarch64'
 }
 processResources.dependsOn linuxArm64LibCopy
 
 task linuxRiscv64LibCopy(type: Copy) {
     from 'besu-native-ec/release/linux-gnu-riscv64/libbesu_native_ec.so'
     from 'besu-native-ec/release/linux-gnu-riscv64/libbesu_native_ec_crypto.so'
-    into 'build/resources/main/lib/riscv64'
+    into 'build/resources/main/lib-native/riscv64'
 }
 processResources.dependsOn linuxRiscv64LibCopy
 

Original file line number	Diff line number	Diff line change
`@@ -32,32 +32,32 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`	`task macAarch64LibCopy(type: Copy) {`
`34`	`34`	`from 'build/darwin-aarch64/lib/libeth_arithmetic.dylib'`
`35`		`- into 'build/resources/main/lib/aarch64'`
	`35`	`+ into 'build/resources/main/lib-native/aarch64'`
`36`	`36`	`}`
`37`	`37`	`processResources.dependsOn macAarch64LibCopy`
`38`	`38`
`39`	`39`
`40`	`40`	`task macLibCopy(type: Copy) {`
`41`	`41`	`from 'build/darwin-x86-64/lib/libeth_arithmetic.dylib'`
`42`		`- into 'build/resources/main/lib/x86-64'`
	`42`	`+ into 'build/resources/main/lib-native/x86-64'`
`43`	`43`	`}`
`44`	`44`	`processResources.dependsOn macLibCopy`
`45`	`45`
`46`	`46`	`task linuxLibCopy(type: Copy) {`
`47`	`47`	`from 'build/linux-gnu-x86_64/lib/libeth_arithmetic.so'`
`48`		`- into 'build/resources/main/lib/x86-64'`
	`48`	`+ into 'build/resources/main/lib-native/x86-64'`
`49`	`49`	`}`
`50`	`50`	`processResources.dependsOn linuxLibCopy`
`51`	`51`
`52`	`52`	`task linuxArm64LibCopy(type: Copy) {`
`53`	`53`	`from 'build/linux-gnu-aarch64/lib/libeth_arithmetic.so'`
`54`		`- into 'build/resources/main/lib/aarch64'`
	`54`	`+ into 'build/resources/main/lib-native/aarch64'`
`55`	`55`	`}`
`56`	`56`	`processResources.dependsOn linuxArm64LibCopy`
`57`	`57`
`58`	`58`	`task linuxRiscv64LibCopy(type: Copy) {`
`59`	`59`	`from 'build/linux-gnu-riscv64/lib/libeth_arithmetic.so'`
`60`		`- into 'build/resources/main/lib/riscv64'`
	`60`	`+ into 'build/resources/main/lib-native/riscv64'`
`61`	`61`	`}`
`62`	`62`	`processResources.dependsOn linuxRiscv64LibCopy`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ private static String safeArchLib(String platformNativeLibraryName) {`
`122`	`122`	`if (Arrays.asList(X86_VARIANTS).contains(arch)) {`
`123`	`123`	`arch = "x86-64";`
`124`	`124`	`}`
`125`		`- return String.format("lib/%s/%s", arch, platformNativeLibraryName );`
	`125`	`+ // It is important that the folder 'lib-native' contains a '-' such that it is only`
	`126`	`+ // folder and not a 'java package' to wich visibility rules may be applied by JPMS.`
	`127`	`+ return String.format("lib-native/%s/%s", arch, platformNativeLibraryName );`
`126`	`128`	`}`
`127`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,23 +28,23 @@ tasks.withType(JavaCompile) {`
`28`	`28`
`29`	`29`	`task macArmLibCopy(type: Copy) {`
`30`	`30`	`from "build/darwin-aarch64/lib/libconstantinebindings.dylib"`
`31`		`- into 'build/resources/main/lib/aarch64'`
	`31`	`+ into 'build/resources/main/lib-native/aarch64'`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`task macLibCopy(type: Copy) {`
`35`	`35`	`from "build/darwin-x86-64/lib/libconstantinebindings.dylib"`
`36`		`- into 'build/resources/main/lib/x86-64'`
	`36`	`+ into 'build/resources/main/lib-native/x86-64'`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`task linuxLibCopy(type: Copy) {`
`40`	`40`	`from "build/linux-gnu-x86_64/lib/libconstantinebindings.so"`
`41`		`- into 'build/resources/main/lib/x86-64'`
	`41`	`+ into 'build/resources/main/lib-native/x86-64'`
`42`	`42`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`task linuxArm64LibCopy(type: Copy) {`
`46`	`46`	`from "build/linux-gnu-aarch64/lib/libconstantinebindings.so"`
`47`		`- into 'build/resources/main/lib/aarch64'`
	`47`	`+ into 'build/resources/main/lib-native/aarch64'`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`processResources.dependsOn macArmLibCopy, macLibCopy, linuxLibCopy, linuxArm64LibCopy`