--- a/langtools/src/jdk.compiler/share/classes/module-info.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/module-info.java Mon Apr 04 12:34:42 2016 -0700
@@ -30,7 +30,6 @@
exports com.sun.source.tree;
exports com.sun.source.util;
exports com.sun.tools.javac;
- exports com.sun.tools.javah;
exports com.sun.tools.doclint to
jdk.javadoc;
exports com.sun.tools.javac.api to
--- a/langtools/test/tools/javac/file/ExplodedImage.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javac/file/ExplodedImage.java Mon Apr 04 12:34:42 2016 -0700
@@ -30,7 +30,6 @@
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.main
- * jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox ExplodedImage
* @run main/othervm ExplodedImage modules/* testDirectoryStreamClosed
* @run main/othervm ExplodedImage modules/* testCanCompileAgainstExplodedImage
--- a/langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 7150368 8003412 8000407 8031545
* @summary javac should include basic ability to generate native headers
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
*/
import java.io.File;
--- a/langtools/test/tools/javah/4942232/Test.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/4942232/Test.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 4942232
* @summary missing param class processes without error
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
* @build ParamClassTest Test
* @run main Test
*/
--- a/langtools/test/tools/javah/6257087/T6257087.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/6257087/T6257087.java Mon Apr 04 12:34:42 2016 -0700
@@ -28,6 +28,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.javah
* @build toolbox.ToolBox toolbox.JavahTask
* @run main T6257087
*/
--- a/langtools/test/tools/javah/6572945/T6572945.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/6572945/T6572945.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 6572945
* @summary rewrite javah as an annotation processor, instead of as a doclet
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
* @build TestClass1 TestClass2 TestClass3
* @run main T6572945
*/
--- a/langtools/test/tools/javah/ModuleClass.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/ModuleClass.java Mon Apr 04 12:34:42 2016 -0700
@@ -28,6 +28,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.javah
* @build toolbox.ToolBox toolbox.JavahTask
* @run main ModuleClass
*/
--- a/langtools/test/tools/javah/T4942232/MissingParamClassTest.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/T4942232/MissingParamClassTest.java Mon Apr 04 12:34:42 2016 -0700
@@ -30,6 +30,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.javah
* @build toolbox.ToolBox toolbox.JavahTask
* @run compile MissingParamClassTest.java
* @clean MissingParamClassException
--- a/langtools/test/tools/javah/T6893943.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/T6893943.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 6893943 6937318
* @summary exit code from javah with no args is 0
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
*/
import java.io.*;
--- a/langtools/test/tools/javah/T6994608.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/T6994608.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 6994608
* @summary javah no longer accepts parameter files as input
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
*/
import java.io.*;
--- a/langtools/test/tools/javah/T7126832/T7126832.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/T7126832/T7126832.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -24,7 +24,7 @@
/*
* @test
* @bug 7126832
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
* @compile java.java
* @summary com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager cannot be cast
* @run main T7126832
--- a/langtools/test/tools/javah/T7185778.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/T7185778.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -28,7 +28,7 @@
* The first two tests are on an inner class name whose name does not contain $.
* The second two tests are on an inner class name whose name does contain $.
* The last test is on an outer class whose name contains $.
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
* @run main T7185778 T7185778$inner
* @run main T7185778 T7185778.inner
* @run main T7185778 T7185778$inner$
--- a/langtools/test/tools/javah/TestHelpOpts.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/TestHelpOpts.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 6893932 6990390
* @summary javah help screen lists -h and -? but does not accept them
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
*/
import java.io.*;
--- a/langtools/test/tools/javah/VersionTest.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/VersionTest.java Mon Apr 04 12:34:42 2016 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -25,7 +25,7 @@
* @test
* @bug 6890226
* @summary javah -version is broken
- * @modules jdk.compiler
+ * @modules jdk.compiler/com.sun.tools.javah
*/
import java.io.*;
--- a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java Mon Apr 04 10:31:20 2016 -0700
+++ b/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java Mon Apr 04 12:34:42 2016 -0700
@@ -30,7 +30,7 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * jdk.jdeps/com.sun.tools.javap
+ * jdk.compiler/com.sun.tools.javah
* @build toolbox.ToolBox toolbox.JavahTask
* @run main ConstMacroTest
*/