From 9fcacb29a504a7480d0a3d9c7e75faec33fac992 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 31 May 2013 14:05:09 +0200
Subject: [PATCH] 7195481: FDS: debuginfo file for libjdwp.so is missed

Reviewed-by: tbell
---
 jdk/make/jpda/back/Makefile              | 2 ++
 jdk/makefiles/CompileNativeLibraries.gmk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jdk/make/jpda/back/Makefile b/jdk/make/jpda/back/Makefile
index 2095c4cf7dc..8c23009b76f 100644
--- a/jdk/make/jpda/back/Makefile
+++ b/jdk/make/jpda/back/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../..
 LIBRARY = jdwp
 PRODUCT = jpda
 
+LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1
+
 FILES_m = mapfile-vers
 
 include $(BUILDDIR)/common/Defs.gmk
diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk
index 1836cbb13f9..bf0a189e91d 100644
--- a/jdk/makefiles/CompileNativeLibraries.gmk
+++ b/jdk/makefiles/CompileNativeLibraries.gmk
@@ -1143,7 +1143,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJDWP,\
 			  -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)