Skip to content

Commit

Permalink
Add multi-platform jar release script
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffery.wsj authored and superajun-wsj committed Jun 27, 2023
1 parent 3faa381 commit 63e8c20
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 493 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ subprojects {
]

signJar = { jarPath ->
if (rootProject.hasProperty('signingKeystore') && rootProject.hasProperty('signingPassword')) {
if (rootProject.hasProperty('signingKeystore') && rootProject.hasProperty('signKeyAlias') && rootProject.hasProperty('signingPassword')) {
def command = 'jarsigner -keystore ' + rootProject.signingKeystore +
' -storepass ' + rootProject.signingPassword +
' ' + jarPath + ' signingcert'
' ' + jarPath + ' ' + rootProject.signKeyAlias
def process = command.execute()
process.waitFor()
if (process.exitValue()) {
Expand Down
2 changes: 1 addition & 1 deletion openjdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ model {

components {
// Builds the JNI library.
conscrypt_openjdk_jni(NativeLibrarySpec) {
tongsuo_native_jni(NativeLibrarySpec) {
nativeBuilds.each { nativeBuild ->
targetPlatform nativeBuild.targetPlatform()
}
Expand Down
6 changes: 3 additions & 3 deletions openjdk/src/main/java/org/conscrypt/NativeCryptoJni.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
*/
final class NativeCryptoJni {
private static final String STATIC_LIB_NAME = "conscrypt";
private static final String DYNAMIC_LIB_NAME_PREFIX = "conscrypt_openjdk_jni";
private static final String DYNAMIC_LIB_NAME_PREFIX = "tongsuo_native_jni";

/**
* Attempts to load the shared JNI library. First try loading the platform-specific library
* name (e.g. conscrypt_openjdk_jni-linux-x86_64). If that doesn't work, try to load the
* library via just the prefix (e.g. conscrypt_openjdk_jni). If not found, try the static
* name (e.g. tongsuo_native_jni-linux-x86_64). If that doesn't work, try to load the
* library via just the prefix (e.g. tongsuo_native_jni). If not found, try the static
* library name.
*
* The non-suffixed dynamic library name is used by the Android build system, which builds
Expand Down
99 changes: 0 additions & 99 deletions release/Dockerfile

This file was deleted.

Loading

0 comments on commit 63e8c20

Please sign in to comment.