# HG changeset patch
# User katleman
# Date 1370369005 25200
# Node ID cfde9878a8c2c8912644039f47b35ed697bf08bf
# Parent  6ae3db58fff1e14faf9beb34c62cbf243a8db19e# Parent  e16be5d4f0431d790b14aaa532f37ac516f29b8b
Merge

diff -r 6ae3db58fff1 -r cfde9878a8c2 jdk/make/jpda/back/Makefile
--- a/jdk/make/jpda/back/Makefile	Mon Jun 03 23:23:20 2013 -0700
+++ b/jdk/make/jpda/back/Makefile	Tue Jun 04 11:03:25 2013 -0700
@@ -31,6 +31,8 @@
 LIBRARY = jdwp
 PRODUCT = jpda
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 FILES_m = mapfile-vers
 
 include $(BUILDDIR)/common/Defs.gmk
diff -r 6ae3db58fff1 -r cfde9878a8c2 jdk/makefiles/CompileLaunchers.gmk
--- a/jdk/makefiles/CompileLaunchers.gmk	Mon Jun 03 23:23:20 2013 -0700
+++ b/jdk/makefiles/CompileLaunchers.gmk	Tue Jun 04 11:03:25 2013 -0700
@@ -95,6 +95,9 @@
         $1_PLIST_FILE:=Info-cmdline.plist
         ifneq ($(11),)
             $1_PLIST_FILE:=$(11)
+            ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
+                $1_CODESIGN:=true
+            endif
         endif
 
         $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
@@ -174,7 +177,8 @@
 		  -D "JDK_INTERNAL_NAME=$1" \
 		  -D "JDK_FTYPE=0x1L" \
 		  $7,\
-	MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest)
+	MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
+	CODESIGN:=$$($1_CODESIGN))
 
     BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
 
diff -r 6ae3db58fff1 -r cfde9878a8c2 jdk/makefiles/CompileNativeLibraries.gmk
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Mon Jun 03 23:23:20 2013 -0700
+++ b/jdk/makefiles/CompileNativeLibraries.gmk	Tue Jun 04 11:03:25 2013 -0700
@@ -1143,7 +1143,7 @@
 			  -D "JDK_INTERNAL_NAME=jdwp" \
 			  -D "JDK_FTYPE=0x2L",\
 		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\
-		DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))
+		DEBUG_SYMBOLS:=true))
 
 $(BUILD_LIBJDWP) : $(BUILD_LIBJAVA)