stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8193503: javah launcher was not removed by JDK-8191054

Browse Source 
Reviewed-by: erikj, darcy
This commit is contained in:
Alan Bateman 2017-12-14 12:36:37 +00:00
parent b01627c0e4
commit b05129a6e2
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/launcher/Launcher-jdk.compiler.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -31,11 +31,6 @@ $(eval $(call SetupBuildLauncher, javac, \
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
)) ))
$(eval $(call SetupBuildLauncher, javah, \
MAIN_CLASS := com.sun.tools.javah.Main, \
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
))
$(eval $(call SetupBuildLauncher, serialver, \ $(eval $(call SetupBuildLauncher, serialver, \
MAIN_CLASS := sun.tools.serialver.SerialVer, \ MAIN_CLASS := sun.tools.serialver.SerialVer, \
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \ CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \

4
test/jdk/tools/launcher/ToolsOpts.java
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
/* /*
* @test * @test
* @bug 8002091 * @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 * 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 * reception of options as passed through the launcher without having to launch
* javac. Only -J and -cp ./* options should be consumed by the launcher. * javac. Only -J and -cp ./* options should be consumed by the launcher.