Skip to content

Commit f3e2f88

Browse files
committed
8346394: Bundled freetype library needs to have JNI_OnLoad for static builds
Reviewed-by: erikj, prr
1 parent 414eb6b commit f3e2f88

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

make/modules/java.desktop/lib/ClientLibraries.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ ifeq ($(FREETYPE_TO_USE), bundled)
283283
OPTIMIZATION := HIGHEST, \
284284
CFLAGS := -DFT2_BUILD_LIBRARY, \
285285
CFLAGS_windows := -DDLL_EXPORT, \
286-
EXTRA_HEADER_DIRS := libfreetype/include, \
286+
EXTRA_HEADER_DIRS := java.base:libjava libfreetype/include, \
287287
DISABLED_WARNINGS_microsoft := 4267 4244 4996, \
288288
DISABLED_WARNINGS_gcc := dangling-pointer stringop-overflow, \
289289
))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
#include "jni_util.h"
27+
28+
/*
29+
* This is needed to mark the bundled freetype library as being part of the JDK,
30+
* which means that for static builds, no additional dynamic library needs to
31+
* be loaded by System.loadLibrary("freetype").
32+
*/
33+
DEF_STATIC_JNI_OnLoad

0 commit comments

Comments
 (0)