# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1265285809 0
# Node ID 23913c0b1b1373e2f1fd4a166ae64bb7b86695db
# Parent  17498133d9ad99dcece514d9231efcec08905372# Parent  60a32d297711f1d2fbc6ed196c31c11be74fa0fa
Merge

diff -r 17498133d9ad -r 23913c0b1b13 common/build.test.xml
--- a/common/build.test.xml	Wed Feb 03 16:06:24 2010 +0000
+++ b/common/build.test.xml	Thu Feb 04 12:16:49 2010 +0000
@@ -82,7 +82,6 @@
                         <arg value="CheckBC.py"/>
                         <arg value="${build.log.dir}/BC/bc.config"/>
                         <arg value="-la"/>
-                        <arg value="-f"/>
                         <arg value="${sf.spec.bccheck.reportid}"/>
                     </exec>
                     <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Libraries_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/libraries_report.xml" failonerror="false" verbose="true"/>
@@ -95,7 +94,6 @@
                         <arg value="CheckBC.py"/>
                         <arg value="${build.log.dir}/BC/bc.config"/>
                         <arg value="-ha"/>
-                        <arg value="-f"/>
                         <arg value="${sf.spec.bccheck.reportid}"/>
                     </exec>
                     <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Headers_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/headers_report.xml" failonerror="false" verbose="true"/>
diff -r 17498133d9ad -r 23913c0b1b13 common/build.xml
--- a/common/build.xml	Wed Feb 03 16:06:24 2010 +0000
+++ b/common/build.xml	Thu Feb 04 12:16:49 2010 +0000
@@ -89,7 +89,7 @@
         </else>
     </if>
     
-    <target name="sf-prep" depends="sf-prep-announce,prep-drive,init-build-area,check-tool-dependencies,create-bom,log-build-env">
+    <target name="sf-prep" depends="sf-prep-announce,prep-drive,init-build-area,create-bom,log-build-env">
         <!-- Test for the disk space we would like for this build -->
 	<fail>
             <condition>