# HG changeset patch
# User erikj
# Date 1372839242 -7200
# Node ID 16a6de786164734ecf0e0dab67eb84b20207fd73
# Parent  6b25b85f10fde5bf1d323851a2715627e6df3772
8012146: Improve tool support
Reviewed-by: ksrini, dholmes, alanb, anthony

diff -r 6b25b85f10fd -r 16a6de786164 jdk/makefiles/CompileLaunchers.gmk
--- a/jdk/makefiles/CompileLaunchers.gmk	Mon Jul 01 15:17:24 2013 +0400
+++ b/jdk/makefiles/CompileLaunchers.gmk	Wed Jul 03 10:14:02 2013 +0200
@@ -52,8 +52,7 @@
 ifeq ($(OPENJDK_TARGET_OS), macosx)
     ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN)
 else
-    ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
-                $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
+    ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
 endif
 
 #
@@ -62,8 +61,7 @@
 # devloper documentation of JAWT and what worked with OpenJDK6.
 #
 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),)
-    ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
-                $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)) 
+    ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR))
 endif
 
 define SetupLauncher
diff -r 6b25b85f10fd -r 16a6de786164 jdk/makefiles/Images.gmk
--- a/jdk/makefiles/Images.gmk	Mon Jul 01 15:17:24 2013 +0400
+++ b/jdk/makefiles/Images.gmk	Wed Jul 03 10:14:02 2013 +0200
@@ -218,6 +218,11 @@
     JDK_LIB_FILES += jexec
 endif
 
+ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris
+    JDK_LIB_FILES += $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
+		     $(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX)
+endif
+
 # Find all files to copy from $(JDK_OUTPUTDIR)/lib
 # Jar files are not expected to be here
 ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\
diff -r 6b25b85f10fd -r 16a6de786164 jdk/test/Makefile
--- a/jdk/test/Makefile	Mon Jul 01 15:17:24 2013 +0400
+++ b/jdk/test/Makefile	Wed Jul 03 10:14:02 2013 +0200
@@ -521,7 +521,8 @@
 	  com/sun/org/apache/xerces \
           com/sun/corba \
 	  com/sun/tracing \
-	  sun/usagetracker)
+	  sun/usagetracker \
+	  misc)
 	$(call RunAgentvmBatch)
 
 # Stable agentvm testruns (minus items from PROBLEM_LIST)