diff --git a/make/jpda/back/Makefile b/make/jpda/back/Makefile
index 2095c4cf7dc2fca0d7baca9d67e7df52a855fccc..8c23009b76f2fb1ee37173b7cb7e7e272f0da8fd 100644
--- a/make/jpda/back/Makefile
+++ b/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/makefiles/CompileNativeLibraries.gmk b/makefiles/CompileNativeLibraries.gmk
index 1836cbb13f9e670288dd9c7aa987968e1064bbb2..bf0a189e91d6282858a7497d8ccc70c9385dfa33 100644
--- a/makefiles/CompileNativeLibraries.gmk
+++ b/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)