Skip to content

Commit 7053cb0

Browse files
committed
"Build" JNI for Mac only (testing)
1 parent 25a5140 commit 7053cb0

File tree

3 files changed

+5
-94
lines changed

3 files changed

+5
-94
lines changed

JNI.xcodeproj/project.pbxproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@
265265
OTHER_SWIFT_FLAGS = "-DXcode";
266266
PRODUCT_NAME = "$(TARGET_NAME)";
267267
SDKROOT = macosx;
268-
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
269268
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
270269
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
271270
USE_HEADERMAP = NO;
@@ -335,7 +334,6 @@
335334
OTHER_SWIFT_FLAGS = "-DXcode";
336335
PRODUCT_NAME = "$(TARGET_NAME)";
337336
SDKROOT = macosx;
338-
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
339337
SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE;
340338
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
341339
USE_HEADERMAP = NO;
@@ -402,7 +400,7 @@
402400
OBJ_4 /* Release */,
403401
);
404402
defaultConfigurationIsVisible = 0;
405-
defaultConfigurationName = Debug;
403+
defaultConfigurationName = Release;
406404
};
407405
OBJ_29 /* Build configuration list for PBXNativeTarget "JNI" */ = {
408406
isa = XCConfigurationList;
@@ -411,7 +409,7 @@
411409
OBJ_31 /* Release */,
412410
);
413411
defaultConfigurationIsVisible = 0;
414-
defaultConfigurationName = Debug;
412+
defaultConfigurationName = Release;
415413
};
416414
OBJ_47 /* Build configuration list for PBXNativeTarget "CJNI" */ = {
417415
isa = XCConfigurationList;
@@ -420,7 +418,7 @@
420418
OBJ_49 /* Release */,
421419
);
422420
defaultConfigurationIsVisible = 0;
423-
defaultConfigurationName = Debug;
421+
defaultConfigurationName = Release;
424422
};
425423
/* End XCConfigurationList section */
426424
};

JNI.xcodeproj/xcshareddata/xcschemes/JNI-Package.xcscheme

Lines changed: 0 additions & 87 deletions
This file was deleted.

Sources/CJNI/include/jni.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,8 +1423,8 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize* _Nonnull);
14231423
* Prototypes for functions exported by loadable shared libs. These are
14241424
* called by JNI, not provided by JNI.
14251425
*/
1426-
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * _Nonnull vm, void * _Null_unspecified reserved);
1427-
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM * _Nonnull vm, void * _Null_unspecified reserved);
1426+
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * _Nonnull vm, void * _Nullable reserved);
1427+
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM * _Nonnull vm, void * _Nullable reserved);
14281428

14291429
#ifdef __cplusplus
14301430
}

0 commit comments

Comments
 (0)