8191736: replace javah w/ javac in jdk tests

Reviewed-by: serb, jjg

test/jdk/java/awt/JAWT/JAWT.sh

@@ -158,12 +158,10 @@ cp ${TESTSRC}${FS}${MAKEFILE} .
 
 JAVA=${TESTJAVA}${FS}bin${FS}java
 JAVAC=${TESTJAVA}${FS}bin${FS}javac
-JAVAH=${TESTJAVA}${FS}bin${FS}javah
 
 export CC SYST ARCH LD_LIBRARY_PATH
 
-${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
-${JAVAH} -jni -classpath . -d . MyCanvas
+${JAVAC} -d . -h . ${TESTSRC}${FS}MyCanvas.java
 ${MAKE} -f ${MAKEFILE}
 ${JAVA} ${TESTVMOPTS} -classpath . MyCanvas
 

test/jdk/java/awt/JAWT/Makefile.cygwin

@@ -26,7 +26,6 @@ CLASSES =	MyCanvas.class
 
 JAVA =		$(TESTJAVA)/bin/java -classpath .
 JAVAC =		$(TESTJAVA)/bin/javac
-JAVAH =		$(TESTJAVA)/bin/javah
 DEL =		rm -rf
 LINK =		$(CC)
 

test/jdk/java/awt/JAWT/Makefile.unix

@@ -27,7 +27,6 @@ CLASSES =	MyCanvas.class
 ENV =		/usr/bin/env
 JAVA =		$(TESTJAVA)/bin/java -classpath .
 JAVAC =		$(TESTJAVA)/bin/javac
-JAVAH =		$(TESTJAVA)/bin/javah
 LINK =		ld
 
 J_INC =		$(TESTJAVA)/include

test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile

@@ -68,11 +68,8 @@ $(LIBDIR)/Launcher.o : Launcher.c \
 	$(CC) -c $(CFLAGS) -o $(LIBDIR)/Launcher.o \
 	    -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) Launcher.c
 	
-Launcher.h : Launcher.class
-	$(JAVA_HOME)/bin/javah -force Launcher
-
-Launcher.class : Launcher.java
-	$(JAVA_HOME)/bin/javac Launcher.java
+Launcher.class Launcher.h : Launcher.java
+	$(JAVA_HOME)/bin/javac -h . Launcher.java
 
 java_home:
 ifndef JAVA_HOME