diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
index df0460ef47ea634b9a27efb9d4de8d0f535c70cf..1d8aeaef8e760fb6656f3ca8d6706b5b831f771b 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/api/API2ComponentAPI.java
@@ -45,6 +45,7 @@ public class API2ComponentAPI implements IClassVisitor
   private Collection includes;
   private Collection excludes;
   private boolean readInterface = false;
+  private boolean skipAPIGen = false;
   private Map interface2ImplClasses = new HashMap(0);
 
   public String getApi()
@@ -107,6 +108,16 @@ public class API2ComponentAPI implements IClassVisitor
     this.readInterface = readInterface;
   }
 
+  public boolean isSkipAPIGen()
+  {
+    return skipAPIGen;
+  }
+
+  public void setSkipAPIGen(boolean skipAPIGen)
+  {
+    this.skipAPIGen = skipAPIGen;
+  }
+
   public List getImplClasses(String interfaceName)
   {
     List implClasses = (List)interface2ImplClasses.get(interfaceName);
@@ -221,7 +232,7 @@ public class API2ComponentAPI implements IClassVisitor
           cfe.printStackTrace();
         }
       }
-      if (isAPI)
+      if (!isSkipAPIGen() && isAPI)
       {
         try
         {
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java
index d01e4c4df960e9227facadd5a2f370058111c864..45aa25a8e6cd12093e3b97ec445724795e2e7fc7 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/tptp/CodeCoverageScanner.java
@@ -148,17 +148,15 @@ public class CodeCoverageScanner implements ILocationVisitor
   public void execute()
   {
     // Generate api-info.xml
-    if (!skipAPIGen)
-    {
-      api2CompXML = new API2ComponentAPI();
-      api2CompXML.setApi(api);
-      api2CompXML.setSrc(src);
-      api2CompXML.setOutputDir(outputDir);
-      api2CompXML.setIncludes(includes);
-      api2CompXML.setExcludes(excludes);
-      api2CompXML.setReadInterface(true);
-      api2CompXML.execute();
-    }
+    api2CompXML = new API2ComponentAPI();
+    api2CompXML.setApi(api);
+    api2CompXML.setSrc(src);
+    api2CompXML.setOutputDir(outputDir);
+    api2CompXML.setIncludes(includes);
+    api2CompXML.setExcludes(excludes);
+    api2CompXML.setReadInterface(true);
+    api2CompXML.setSkipAPIGen(skipAPIGen);
+    api2CompXML.execute();
 
     // Visit all .trcxml files that uses APIs
     Location.createLocation(new File(trcxml)).accept(this);