# HG changeset patch
# User serb
# Date 1387378327 -14400
# Node ID e1de5002b069d21289331fe24f66342bcc6ad3fe
# Parent  43e5bc27297f2344091f5e8f5508ba239aef25ae
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

diff -r 43e5bc27297f -r e1de5002b069 jdk/make/CompileJavaClasses.gmk
--- a/jdk/make/CompileJavaClasses.gmk	Wed Dec 18 11:01:33 2013 +0000
+++ b/jdk/make/CompileJavaClasses.gmk	Wed Dec 18 18:52:07 2013 +0400
@@ -402,7 +402,8 @@
           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 @@
           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 @@
           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)