Add more exceptions to check_deps to allow usage of icedtea.

src/scripts/check_deps

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import sys
 
@@ skipping 10 matching lines @@
     Args:
       root: The sysroot (e.g. "/")
       verbose: Print helpful messages.
     """
 
     self._root = root
     self._libcache = set()
     self._verbose = verbose
 
     # Insert some default directories into our library cache.
-    # The /usr/lib/nss and /usr/lib/nspr directories are
-    # required for understanding old-style Netscape plugins.
-    self._ReadLibs([
-        "%s/lib" % root,
-        "%s/usr/local/lib" % root,
-        "%s/usr/lib" % root,
-        "%s/usr/lib/nss" % root,
-        "%s/usr/lib/nspr" % root,
-        "%s/opt/google/o3d/lib" % root
-    ], self._libcache)
+    libdirs = [
+      "%s/lib" % root,
+      "%s/usr/lib" % root,
+      "%s/opt/google/o3d/lib" % root,
+      "%s/usr/lib/opengl/xorg-x11/lib" % root,
+      "%s/usr/local/lib/icedtea6/jre/lib/i386/client" % root,
+      "%s/usr/local/lib/icedtea6/jre/lib/i386/headless" % root
+    ]
+
+    # Read more directories from ld.so.conf.
+    ld_so_conf = "%s/etc/ld.so.conf" % root
+    if os.path.exists(ld_so_conf):
+      f = file(ld_so_conf)
+      for line in f:
+        if line.startswith("/"):
+          path = root + line[:-1]
+          if os.path.exists(path):
+            libdirs.append(path)
+      f.close()
+
+    self._ReadLibs(libdirs, self._libcache)
 
   def _ReadLibs(self, paths, libcache):
     for path in paths:
       if os.path.exists(path):
         for lib in os.listdir(path):
           libcache.add(lib)
 
   def _ReadDependencies(self, binary):
     """Run readelf -d on BINARY, returning (deps, rpaths)."""
 
     deps = set()
     rpaths = set()
 
     # Read list of dynamic libraries, ignoring error messages that occur
     # when we look at files that aren't actually libraries
     f = os.popen("readelf -d '%s' 2>/dev/null" % binary)
     for line in f:
 
       # Grab dependencies
       m = _SHARED_RE.search(line)
       if m:
         deps.add(m.group(1))
 
       # Add RPATHs in our search path
       m = _RPATH_RE.search(line)
       if m:
         for path in m.group(1).split(":"):
-          rpaths.add(os.path.join(self._root, path[1:]))
+          if path.startswith("$ORIGIN"):
+            rpaths.add(path.replace("$ORIGIN", os.path.dirname(binary)))
+          else:
+            rpaths.add(os.path.join(self._root, path[1:]))
     f.close()
 
     return (deps, rpaths)
 
   def CheckDependencies(self, binary):
     """Check whether the libs for BINARY can be found in our sysroot."""
 
     good = True
 
     deps, rpaths = self._ReadDependencies(binary)
@@ skipping 40 matching lines @@
     if not checker.CheckDependencies(binary):
       errors = True
 
   if errors:
     sys.exit(1)
   else:
     sys.exit(0)
 
 if __name__ == "__main__":
   main()