--- a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk	Sat Jul 30 00:11:02 2016 +0000
+++ b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk	Mon Aug 01 10:51:32 2016 +0300
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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,12 +25,6 @@
 
 include LauncherCommon.gmk
 
-$(eval $(call SetupBuildLauncher, jsadebugd, \
-    MAIN_CLASS := sun.jvm.hotspot.jdi.SADebugServer, \
-    MACOSX_SIGNED := true, \
-))
-
-
 $(eval $(call SetupBuildLauncher, jhsdb, \
     MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
     MACOSX_SIGNED := true, \

--- a/jdk/test/tools/launcher/VersionCheck.java	Sat Jul 30 00:11:02 2016 +0000
+++ b/jdk/test/tools/launcher/VersionCheck.java	Mon Aug 01 10:51:32 2016 +0300
@@ -93,7 +93,6 @@
         "jps",
         "jrunscript",
         "jjs",
-        "jsadebugd",
         "jstack",
         "jstat",
         "jstatd",