infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8346394: Bundled freetype library needs to have JNI_OnLoad for static builds

Browse Source 
Reviewed-by: erikj, prr
This commit is contained in:
Magnus Ihse Bursie 2024-12-17 19:09:29 +00:00
parent 414eb6bb83
commit f3e2f8821a
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/modules/java.desktop/lib/ClientLibraries.gmk
View File

@ -283,7 +283,7 @@ ifeq ($(FREETYPE_TO_USE), bundled)
OPTIMIZATION := HIGHEST, \
CFLAGS := -DFT2_BUILD_LIBRARY, \
CFLAGS_windows := -DDLL_EXPORT, \
EXTRA_HEADER_DIRS := libfreetype/include, \
EXTRA_HEADER_DIRS := java.base:libjava libfreetype/include, \
DISABLED_WARNINGS_microsoft := 4267 4244 4996, \
DISABLED_WARNINGS_gcc := dangling-pointer stringop-overflow, \
))

33
src/java.desktop/share/native/libfreetype/java_freetype.c Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2024, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#include "jni_util.h"
/*
* This is needed to mark the bundled freetype library as being part of the JDK,
* which means that for static builds, no additional dynamic library needs to
* be loaded by System.loadLibrary("freetype").
*/
DEF_STATIC_JNI_OnLoad