changeset 7240:c50add191a39

Merge
author katleman
date Tue, 04 Jun 2013 11:03:25 -0700
parents 7eae7c89dab4 bc3a17982aae
children 16003f414ca3
files makefiles/CompileNativeLibraries.gmk
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/jpda/back/Makefile	Mon Jun 03 23:23:20 2013 -0700
+++ b/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
--- a/makefiles/CompileLaunchers.gmk	Mon Jun 03 23:23:20 2013 -0700
+++ b/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)
 
--- a/makefiles/CompileNativeLibraries.gmk	Mon Jun 03 23:23:20 2013 -0700
+++ b/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)