Bug 572113 - Build native library in equinox.security for arm64
Changes to build universal library for arm64 and x86_64, also cleanup
xcode project.
- clean-up unused archs and add arm64
- For jni.h: JavaVM framework is not available since XCode 12.2, so use
header from the installed Java. Pass value to xcode using
JAVA_HOME.
- Change <jni.h> to "jni.h" as it's not in the Framework and set
ALWAYS_SEARCH_USER_PATHS = NO
- Fix ALWAYS_SEARCH_USER_PATHS is deprecated warning
- setPassword() in C code returns void, remove String return type in
OSXProvider.setPassword() as this causes NPE.
- Skip signing during xcode build using CODE_SIGN_IDENTITY = "" and
CODE_SIGN_STYLE = Manual
Change-Id: Ib045f1966115ec1e27aecba44d58ae046a3bd16d
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>
diff --git a/bundles/org.eclipse.equinox.security.macosx/keystoreNative/src/keystoreNativejnilib.c b/bundles/org.eclipse.equinox.security.macosx/keystoreNative/src/keystoreNativejnilib.c
index b8f8658..5d64a2a 100644
--- a/bundles/org.eclipse.equinox.security.macosx/keystoreNative/src/keystoreNativejnilib.c
+++ b/bundles/org.eclipse.equinox.security.macosx/keystoreNative/src/keystoreNativejnilib.c
@@ -12,7 +12,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-#include <jni.h>
+#include "jni.h"
#include "keystoreNative.h"
#include <CoreFoundation/CoreFoundation.h>
#include <Security/Security.h>