# HG changeset patch
# User alanb
# Date 1513254997 0
# Node ID f1e1a4fc1cc7f811b1ac0438a98886954402d3a4
# Parent  f47c18852172d8f2374f80d91b9098365e6a3300
8193503: javah launcher was not removed by JDK-8191054
Reviewed-by: erikj, darcy

diff -r f47c18852172 -r f1e1a4fc1cc7 make/launcher/Launcher-jdk.compiler.gmk
--- a/make/launcher/Launcher-jdk.compiler.gmk	Thu Dec 14 20:19:34 2017 +0800
+++ b/make/launcher/Launcher-jdk.compiler.gmk	Thu Dec 14 12:36:37 2017 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -31,11 +31,6 @@
    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
 ))
 
-$(eval $(call SetupBuildLauncher, javah, \
-    MAIN_CLASS := com.sun.tools.javah.Main, \
-    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
-))
-
 $(eval $(call SetupBuildLauncher, serialver, \
     MAIN_CLASS := sun.tools.serialver.SerialVer, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
diff -r f47c18852172 -r f1e1a4fc1cc7 test/jdk/tools/launcher/ToolsOpts.java
--- a/test/jdk/tools/launcher/ToolsOpts.java	Thu Dec 14 20:19:34 2017 +0800
+++ b/test/jdk/tools/launcher/ToolsOpts.java	Thu Dec 14 12:36:37 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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 8002091
- * @summary Test options patterns for javac,javah,javap and javadoc using
+ * @summary Test options patterns for javac,javap and javadoc using
  * javac as a test launcher. Create a dummy javac and intercept options to check
  * reception of options as passed through the launcher without having to launch
  * javac. Only -J and -cp ./* options should be consumed by the launcher.