6953294: Fix for 6909002 was incorrectly merged
Reviewed-by: okutsu
## Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.## This code is free software; you can redistribute it and/or modify it# under the terms of the GNU General Public License version 2 only, as# published by the Free Software Foundation. Sun designates this# particular file as subject to the "Classpath" exception as provided# by Sun in the LICENSE file that accompanied this code.## This code is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License# version 2 for more details (a copy is included in the LICENSE file that# accompanied this code).## You should have received a copy of the GNU General Public License version# 2 along with this work; if not, write to the Free Software Foundation,# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.## Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,# CA 95054 USA or visit www.sun.com if you need additional information or# have any questions.## Base locations where bundles are locatedslashjava=/javadrops.dir=${slashjava}/devtools/share/jdk7-drops# This is the JDK used to build and run the bootstrap version of javac.# The bootstrap javac is used to compile both boostrap versions of the# other tools, and product versions of all the tools.# Override this path as needed, either on the command line or in # one of the standard user build.properties files (see build.xml)javac.jar=${bootstrap.dir}/lib/javac.jar# The tools.jar is needed in the classpath to compile these sourcesjdk.home=${java.home}/..tools.jar=${jdk.home}/lib/tools.jar# options for the <javac> tasks used to compile the toolsjavac.source = 7javac.target = 7javac.debug = truejavac.no.jdk.warnings = -XDignore.symbol.file=true# set the following to -version to verify the versions of javac being usedjavac.version.opt = # in time, there should be no exceptions to -Xlint:all#javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serialjavac.lint.opts=# JVM memory sizejavac.memoryInitialSize = 256mjavac.memoryMaximumSize = 512m#------------------------------------------------------------# Root of output directoriesoutput.dir=.# Built filesbuild.dir=${output.dir}/buildbuild.classes.dir=${build.dir}/classes# Distributed resultsdist.dir=${output.dir}/distdist.lib.dir=${dist.dir}/libdist.classes.jar=${dist.lib.dir}/classes.jardist.src.zip=${dist.lib.dir}/src.zip# Where all drop sources get placed when downloaded and unzippeddrop.expanded.dir=${output.dir}/drop# Location if the sources were included alreadydrop.included.dir=./drop_included# Where patches to drop bundle sources livepatches.dir=patches# Sanity informationsanity.info= Sanity Settings:${line.separator}\ ant.home=${ant.home}${line.separator}\ ant.version=${ant.version}${line.separator}\ ant.java.version=${ant.java.version}${line.separator}\ java.home=${java.home}${line.separator}\ java.version=${java.version}${line.separator}\ os.name=${os.name}${line.separator}\ os.arch=${os.arch}${line.separator}\ os.version=${os.version}${line.separator}\ bootstrap.dir=${bootstrap.dir}${line.separator}\ javac.jar=${javac.jar}${line.separator}\ javac.memoryInitialSize=${javac.memoryInitialSize}${line.separator}\ javac.memoryMaximumSize=${javac.memoryMaximumSize}${line.separator}\ javac.source=${javac.source}${line.separator}\ javac.debug=${javac.debug}${line.separator}\ javac.target=${javac.target}${line.separator}\ javac.version.opt=${javac.version.opt}${line.separator}\ javac.lint.opts=${javac.lint.opts}${line.separator}\ javac.no.jdk.warnings=${javac.no.jdk.warnings}${line.separator}\ output.dir=${output.dir}${line.separator}\ build.dir=${build.dir}${line.separator}\ dist.dir=${dist.dir}${line.separator}\ drop.dir=${drop.dir}${line.separator}\ drops.dir=${drops.dir}${line.separator}\${line.separator}#------------------------------------------------------------