7159320: change default ZIP_DEBUGINFO_FILES back to '1' after fix for 7133529 is available

Reviewed-by: ohair, jmelvin, sspitsyn

7159320: change default ZIP_DEBUGINFO_FILES back to '1' after fix for 7133529 is available
Reviewed-by: ohair, jmelvin, sspitsyn
dbb7d59b · dcubed · 4b49c5e7 · dbb7d59b · dbb7d59b · dbb7d59b
Showing with 3 addition and 9 deletion

make/common/Defs-linux.gmk make/common/Defs-linux.gmk +1 -3

make/common/Defs-solaris.gmk make/common/Defs-solaris.gmk +1 -3

make/common/Defs-windows.gmk make/common/Defs-windows.gmk +1 -3

未找到文件。
--- a/make/common/Defs-linux.gmk
+++ b/make/common/Defs-linux.gmk
@@ -157,9 +157,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    _JUNK_ := $(shell \
      echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-    # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
+    ZIP_DEBUGINFO_FILES ?= 1
-    # changes are promoted
-    ZIP_DEBUGINFO_FILES ?= 0
    _JUNK_ := $(shell \
      echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")

--- a/make/common/Defs-solaris.gmk
+++ b/make/common/Defs-solaris.gmk
@@ -165,9 +165,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    _JUNK_ := $(shell \
      echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
-    # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
+    ZIP_DEBUGINFO_FILES ?= 1
-    # changes are promoted
-    ZIP_DEBUGINFO_FILES ?= 0
    _JUNK_ := $(shell \
      echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")

--- a/make/common/Defs-windows.gmk
+++ b/make/common/Defs-windows.gmk
@@ -113,9 +113,7 @@ _JUNK_ := $(shell \
  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
+  ZIP_DEBUGINFO_FILES ?= 1
-  # changes are promoted
-  ZIP_DEBUGINFO_FILES ?= 0
 else
  ZIP_DEBUGINFO_FILES=0
 endif