CheckCallDie: add option to suppress successful output

build/android/gyp/write_ordered_libraries.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Writes dependency ordered list of native libraries.
 
 The list excludes any Android system libraries, as those are not bundled with
 the APK.
 
 This list of libraries is used for several steps of building an APK.
 In the component build, the --input-libraries only needs to be the top-level
 library (i.e. libcontent_shell_content_view). This will then use readelf to
 inspect the shared libraries and determine the full list of (non-system)
 libraries that should be included in the APK.
 """
 
 # TODO(cjhopman): See if we can expose the list of library dependencies from
 # gyp, rather than calculating it ourselves.
 # http://crbug.com/225558
 
 import json
 import optparse
 import os
 import re
 import sys
 
-BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
-sys.path.append(BUILD_ANDROID_DIR)
-
-from pylib import build_utils
+from util import build_utils
 
 
 _options = None
 _libraries_dir = None
 _library_re = re.compile(
     '.*NEEDED.*Shared library: \[(?P<library_name>[\w/.]+)\]')
 
 
 def FullLibraryPath(library_name):
   return '%s/%s' % (_libraries_dir, library_name)
 
 
 def IsSystemLibrary(library_name):
   # If the library doesn't exist in the libraries directory, assume that it is
   # an Android system library.
   return not os.path.exists(FullLibraryPath(library_name))
 
 
 def CallReadElf(library_name):
   readelf_cmd = [_options.readelf,
                  '-d',
                  FullLibraryPath(library_name)]
-  return build_utils.CheckCallDie(readelf_cmd)
+  return build_utils.CheckCallDie(readelf_cmd, suppress_output=True)
 
 
 def GetDependencies(library_name):
   elf = CallReadElf(library_name)
   return set(_library_re.findall(elf))
 
 
 def GetNonSystemDependencies(library_name):
   all_deps = GetDependencies(library_name)
   return set((lib for lib in all_deps if not IsSystemLibrary(lib)))
@@ skipping 48 matching lines @@
     json.dump(libraries, outfile)
 
   if _options.stamp:
     build_utils.Touch(_options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))