From 2f19a10afae9d7cb16d277105935a4686fe1fcd2 Mon Sep 17 00:00:00 2001 From: serb Date: Wed, 11 Dec 2013 22:17:19 +0400 Subject: [PATCH] 8029045: Regression - Unsatisfied Link Error when the Java Access Bridge is started Summary: Rename native function name; fix make to rebuild jni header file Reviewed-by: erikj, tbell Contributed-by: peter.brunet@oracle.com --- make/CompileJavaClasses.gmk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/make/CompileJavaClasses.gmk b/make/CompileJavaClasses.gmk index a06c41573..c4be75532 100644 --- a/make/CompileJavaClasses.gmk +++ b/make/CompileJavaClasses.gmk @@ -402,7 +402,8 @@ ifndef OPENJDK SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) @@ -410,7 +411,8 @@ ifndef OPENJDK SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) @@ -420,7 +422,8 @@ ifndef OPENJDK SETUP := GENERATE_JDKBYTECODE, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \ - BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit)) + BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit, \ + HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK) -- GitLab