From e04ad243e026464eee3590a21f144dfc0393e8bb Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Thu, 26 May 2016 13:06:54 -0700 Subject: [PATCH] 8157164: Static build of libzip is missing JNI_OnLoad_zip entry point Reviewed-by: sherman --- jdk/src/java.base/share/native/libzip/zip_util.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/native/libzip/zip_util.c b/jdk/src/java.base/share/native/libzip/zip_util.c index 4837fc81c66..26f507e90e4 100644 --- a/jdk/src/java.base/share/native/libzip/zip_util.c +++ b/jdk/src/java.base/share/native/libzip/zip_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,6 +76,13 @@ static void freeCEN(jzfile *); static jint INITIAL_META_COUNT = 2; /* initial number of entries in meta name array */ +/* + * Declare library specific JNI_Onload entry if static build + */ +#ifdef STATIC_BUILD +DEF_STATIC_JNI_OnLoad +#endif + /* * The ZFILE_* functions exist to provide some platform-independence with * respect to file access needs.