Remove references to sconsbuild.

scons hasn't been used in a long time.

BUG=305702
NOTRY=true

Review URL: https://codereview.chromium.org/26718002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228308 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 8 insertions, 17 deletions

diff --git a/build/common.croc b/build/common.croc
index ecf29f2..fde7a8b 100644
--- a/build/common.croc
+++ b/build/common.croc
@@ -57,7 +57,7 @@
     },
     # Don't include output dirs
     {
-      'regexp' : '.*/(Debug|Release|sconsbuild|out|xcodebuild)/',
+      'regexp' : '.*/(Debug|Release|out|xcodebuild)/',
       'include' : 0,
     },
     # Don't include third-party source
diff --git a/build/landmines.py b/build/landmines.py
index 91b4fa9..7b4c5b5 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -47,8 +47,6 @@ def get_target_build_dir(build_tool, target, is_iphone=False):
     ret = os.path.join(SRC_DIR, 'out', target)
   elif build_tool in ['msvs', 'vs', 'ib']:
     ret = os.path.join(SRC_DIR, 'build', target)
-  elif build_tool == 'scons':
-    ret = os.path.join(SRC_DIR, 'sconsbuild', target)
   else:
     raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)
   return os.path.abspath(ret)
diff --git a/chrome/test/chromedriver/chrome_paths.py b/chrome/test/chromedriver/chrome_paths.py
index 5b9c976..58c4d3e 100644
--- a/chrome/test/chromedriver/chrome_paths.py
+++ b/chrome/test/chromedriver/chrome_paths.py
@@ -23,7 +23,7 @@ def GetTestData():
 
 def GetBuildDir(required_paths):
   """Returns the preferred build directory that contains given paths."""
-  dirs = ['out', 'build', 'xcodebuild', 'sconsbuild']
+  dirs = ['out', 'build', 'xcodebuild']
   rel_dirs = [os.path.join(x, 'Release') for x in dirs]
   debug_dirs = [os.path.join(x, 'Debug') for x in dirs]
   full_dirs = [os.path.join(GetSrc(), x) for x in rel_dirs + debug_dirs]
diff --git a/chrome/test/nacl_test_injection/find_chrome.py b/chrome/test/nacl_test_injection/find_chrome.py
index 186a83b..e6d2b24 100755
--- a/chrome/test/nacl_test_injection/find_chrome.py
+++ b/chrome/test/nacl_test_injection/find_chrome.py
@@ -25,13 +25,11 @@ def FindChrome(src_dir, configs, verbose=False):
     chrome_locations.extend([
         'build/%s/chrome.exe' % config,
         'chrome/%s/chrome.exe' % config,
-        # For Linux buildbots.  scripts/slave/extract_build.py extracts builds
-        # to src/sconsbuild/ rather than src/out/.
-        'sconsbuild/%s/chrome' % config,
         # Windows Chromium ninja builder
         'out/%s/chrome.exe' % config,
+        # Linux
         'out/%s/chrome' % config,
-        # Mac Chromium make builder
+        # Mac Chromium ninja builder
         'out/%s/Chromium.app/Contents/MacOS/Chromium' % config,
         # Mac release make builder
         'out/%s/Google Chrome.app/Contents/MacOS/Google Chrome' % config,
diff --git a/chrome/test/pyautolib/pyauto_paths.py b/chrome/test/pyautolib/pyauto_paths.py
index 1373d5e..412b661 100644
--- a/chrome/test/pyautolib/pyauto_paths.py
+++ b/chrome/test/pyautolib/pyauto_paths.py
@@ -23,8 +23,8 @@ def GetBuildDirs():
   """Returns list of possible build directories."""
   # List of dirs that can contain a Debug/Release build.
   outer_dirs = {
-      'linux2': ['out', 'sconsbuild'],
-      'linux3': ['out', 'sconsbuild'],
+      'linux2': ['out'],
+      'linux3': ['out'],
       'darwin': ['out', 'xcodebuild'],
       'win32':  ['chrome', 'build', 'out'],
       'cygwin': ['chrome'],
diff --git a/chrome_frame/chrome_frame.croc b/chrome_frame/chrome_frame.croc
index de3ffcd..cfcb9e8 100644
--- a/chrome_frame/chrome_frame.croc
+++ b/chrome_frame/chrome_frame.croc
@@ -56,7 +56,7 @@
     },
     # Don't include output dirs
     {
-      'regexp' : '.*/(Debug|Release|debug|release|sconsbuild|out|xcodebuild)/',
+      'regexp' : '.*/(Debug|Release|debug|release|out|xcodebuild)/',
       'include' : 0,
     },
     # Don't include third-party source
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index c8fa702..179e810 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -493,7 +493,7 @@ def check_licenses(options, args):
 
     # All files in the build output directory are generated one way or another.
     # There's no need to check them.
-    if filename.startswith('out/') or filename.startswith('sconsbuild/'):
+    if filename.startswith('out/'):
       continue
 
     # For now we're just interested in the license.
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
index eda64bb..7192c13 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder_unittest.py
@@ -73,10 +73,6 @@ class FindLocalBuildsTest(FindTestBase):
     self._files.append('..\\..\\..\\out\\Release\\chrome.exe')
     self.assertTrue('release' in self.DoFindAllTypes())
 
-  def testFindSconsbuild(self):
-    self._files.append('..\\..\\..\\sconsbuild\\Release\\chrome.exe')
-    self.assertTrue('release' in self.DoFindAllTypes())
-
   def testFindXcodebuild(self):
     self._files.append('..\\..\\..\\xcodebuild\\Release\\chrome.exe')
     self.assertTrue('release' in self.DoFindAllTypes())
diff --git a/tools/telemetry/telemetry/core/util.py b/tools/telemetry/telemetry/core/util.py
index 9c7a4b1..a013eea 100644
--- a/tools/telemetry/telemetry/core/util.py
+++ b/tools/telemetry/telemetry/core/util.py
@@ -114,7 +114,6 @@ def GetBuildDirectories():
   """Yields all combination of Chromium build output directories."""
   build_dirs = ['build',
                 'out',
-                'sconsbuild',
                 'xcodebuild']
 
   build_types = ['Debug', 'Debug_x64', 'Release', 'Release_x64']