# HG changeset patch
# User dcubed
# Date 1334678577 25200
# Node ID 9df4dd548612d8cd4266ea42ad06579d84d8149c
# Parent  487c6b61f6a671ebdf23eda3c0ad1927b390dd8d
7159320: change default ZIP_DEBUGINFO_FILES back to '1' after fix for 7133529 is available
Reviewed-by: ohair, jmelvin, sspitsyn

diff -r 487c6b61f6a6 -r 9df4dd548612 jdk/make/common/Defs-linux.gmk
--- a/jdk/make/common/Defs-linux.gmk	Tue Apr 17 08:49:50 2012 -0700
+++ b/jdk/make/common/Defs-linux.gmk	Tue Apr 17 09:02:57 2012 -0700
@@ -157,9 +157,7 @@
     _JUNK_ := $(shell \
       echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-    # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
-    # changes are promoted
-    ZIP_DEBUGINFO_FILES ?= 0
+    ZIP_DEBUGINFO_FILES ?= 1
 
     _JUNK_ := $(shell \
       echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
diff -r 487c6b61f6a6 -r 9df4dd548612 jdk/make/common/Defs-solaris.gmk
--- a/jdk/make/common/Defs-solaris.gmk	Tue Apr 17 08:49:50 2012 -0700
+++ b/jdk/make/common/Defs-solaris.gmk	Tue Apr 17 09:02:57 2012 -0700
@@ -165,9 +165,7 @@
     _JUNK_ := $(shell \
       echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-    # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
-    # changes are promoted
-    ZIP_DEBUGINFO_FILES ?= 0
+    ZIP_DEBUGINFO_FILES ?= 1
 
     _JUNK_ := $(shell \
       echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
diff -r 487c6b61f6a6 -r 9df4dd548612 jdk/make/common/Defs-windows.gmk
--- a/jdk/make/common/Defs-windows.gmk	Tue Apr 17 08:49:50 2012 -0700
+++ b/jdk/make/common/Defs-windows.gmk	Tue Apr 17 09:02:57 2012 -0700
@@ -113,9 +113,7 @@
   echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
-  # changes are promoted
-  ZIP_DEBUGINFO_FILES ?= 0
+  ZIP_DEBUGINFO_FILES ?= 1
 else
   ZIP_DEBUGINFO_FILES=0
 endif