# HG changeset patch # User naoto # Date 1464293214 25200 # Node ID a1af6c6ada38847d5d5bdc0c144f7c9d5cc04157 # Parent 4964706e8a45cfcd9478637adec49537e389add0 8157164: Static build of libzip is missing JNI_OnLoad_zip entry point Reviewed-by: sherman diff -r 4964706e8a45 -r a1af6c6ada38 jdk/src/java.base/share/native/libzip/zip_util.c --- a/jdk/src/java.base/share/native/libzip/zip_util.c Thu May 26 19:55:00 2016 +0200 +++ b/jdk/src/java.base/share/native/libzip/zip_util.c Thu May 26 13:06:54 2016 -0700 @@ -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 @@ -77,6 +77,13 @@ 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. */