Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Side by Side Diff: src/scripts/check_deps

Issue 1618007: Add /usr/local/lib to readlibs for test_image and move ldconfig higher for sful (Closed)
Patch Set: Not false Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/scripts/build_image ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 import os 7 import os
8 import re 8 import re
9 import sys 9 import sys
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 self._root = root 26 self._root = root
27 self._libcache = set() 27 self._libcache = set()
28 self._verbose = verbose 28 self._verbose = verbose
29 29
30 # Insert some default directories into our library cache. 30 # Insert some default directories into our library cache.
31 # The /usr/lib/nss and /usr/lib/nspr directories are 31 # The /usr/lib/nss and /usr/lib/nspr directories are
32 # required for understanding old-style Netscape plugins. 32 # required for understanding old-style Netscape plugins.
33 self._ReadLibs([ 33 self._ReadLibs([
34 "%s/lib" % root, 34 "%s/lib" % root,
35 "%s/usr/local/lib" % root,
35 "%s/usr/lib" % root, 36 "%s/usr/lib" % root,
36 "%s/usr/lib/nss" % root, 37 "%s/usr/lib/nss" % root,
37 "%s/usr/lib/nspr" % root, 38 "%s/usr/lib/nspr" % root,
38 "%s/opt/google/o3d/lib" % root 39 "%s/opt/google/o3d/lib" % root
39 ], self._libcache) 40 ], self._libcache)
40 41
41 def _ReadLibs(self, paths, libcache): 42 def _ReadLibs(self, paths, libcache):
42 for path in paths: 43 for path in paths:
43 if os.path.exists(path): 44 if os.path.exists(path):
44 for lib in os.listdir(path): 45 for lib in os.listdir(path):
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 if not checker.CheckDependencies(binary): 119 if not checker.CheckDependencies(binary):
119 errors = True 120 errors = True
120 121
121 if errors: 122 if errors:
122 sys.exit(1) 123 sys.exit(1)
123 else: 124 else:
124 sys.exit(0) 125 sys.exit(0)
125 126
126 if __name__ == "__main__": 127 if __name__ == "__main__":
127 main() 128 main()
OLDNEW
« no previous file with comments | « src/scripts/build_image ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698