Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump static JDK version #1282

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Bump static JDK version #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf6de76
Bump static JDK version
jperedadnr Sep 11, 2024
7f2b79d
Remove JVM_ArrayCopy from iOS/JvmFuncsFallbacks.c
jperedadnr Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/gluonhq/substrate/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public static VMONE_TARGET fromTriplet(String triplet) {
public static final String PROFILE_LINUX_AARCH64 = "linux-aarch64";
public static final String PROFILE_WEB = "web";

public static final String DEFAULT_JAVA_STATIC_SDK_VERSION = "24-1";
public static final String DEFAULT_JAVA_STATIC_SDK_VERSION = "24-2";
public static final String DEFAULT_JAVAFX_STATIC_SDK_VERSION = "24-ea+7.1";
public static final String DEFAULT_JAVAFX_JS_SDK_VERSION = "18-internal+0-2021-09-02-165800";
public static final String DEFAULT_SYSROOT_VERSION = "20210424";
Expand Down
5 changes: 0 additions & 5 deletions src/main/resources/native/ios/JvmFuncsFallbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ JNIEXPORT jobject JNICALL JVM_AreNestMates(JNIEnv *env) {
return NULL;
}

JNIEXPORT jobject JNICALL JVM_ArrayCopy(JNIEnv *env) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a follow-up, this whole file should be removed, as it is obsoleted by libvmone.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take that all these dummy functions are not used at all, but are not in vmone yet (otherwise we'd get duplicated symbols). Do you mean we should move them to vmone?

(*env)->FatalError(env, "JVM_ArrayCopy called: Unimplemented");
return NULL;
}

JNIEXPORT jobject JNICALL JVM_AssertionStatusDirectives(JNIEnv *env) {
(*env)->FatalError(env, "JVM_AssertionStatusDirectives called: Unimplemented");
return NULL;
Expand Down
Loading