--- a/make/lib/Lib-jdk.crypto.cryptoki.gmk Thu Apr 12 14:11:59 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk Mon Apr 16 11:48:41 2018 +0200
@@ -27,14 +27,11 @@
################################################################################
-LIBJ2PKCS11_SRC := $(TOPDIR)/src/jdk.crypto.cryptoki/share/native/libj2pkcs11 \
- $(TOPDIR)/src/jdk.crypto.cryptoki/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11
-
$(eval $(call SetupJdkLibrary, BUILD_LIBJ2PKCS11, \
NAME := j2pkcs11, \
- SRC := $(LIBJ2PKCS11_SRC), \
OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+ HEADER_FLAGS := \
$(LIBJAVA_HEADER_FLAGS) \
-I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.cryptoki, \
LDFLAGS := $(LDFLAGS_JDKLIB) \