# HG changeset patch
# User poonam
# Date 1234265191 28800
# Node ID e3166b387ec573db7f19021a3430d2ffea9c0fae
# Parent  dbdfa384e375a6bb5a066be2d3976539a2f0778b
6755621: Include SA binaries into Windows JDK
Summary: These changes will enable inclusion of sa-jdi.jar and sawindbg.dll into Windows JDK bundle.
Reviewed-by: never, jjh, alanb

diff -r dbdfa384e375 -r e3166b387ec5 jdk/make/common/Defs-windows.gmk
--- a/jdk/make/common/Defs-windows.gmk	Fri Feb 06 09:43:27 2009 -0800
+++ b/jdk/make/common/Defs-windows.gmk	Tue Feb 10 03:26:31 2009 -0800
@@ -398,16 +398,7 @@
   # SA will never be supported here.
   INCLUDE_SA = false
 else
-  # Hopefully, SA will be supported here one of these days,
-  # and these will be changed to true.  Until then,
-  # to build SA on windows, do a control build with
-  #    BUILD_WIN_SA=1
-  # on the make command.
-  ifdef BUILD_WIN_SA
-    INCLUDE_SA = true
-  else
-    INCLUDE_SA = false
-  endif
+  INCLUDE_SA = true
 endif
 
 # Settings for the VERSIONINFO tap on windows.