--- a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk	Tue Jul 21 20:37:19 2015 +0200
+++ b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk	Thu Jul 23 18:17:02 2015 +0300
@@ -27,6 +27,10 @@
 
 $(eval $(call SetupLauncher,jsadebugd, \
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
-    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
     ,,,,,,,,,Info-privileged.plist))
 
+
+$(eval $(call SetupLauncher,jhsdb, \
+    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.SALauncher"$(COMMA) }' \
+    ,,,,,,,,,Info-privileged.plist))
+