[NaCl SDK] Silence objdump warning when building w/ Chrome dev/beta.

native_client_sdk/src/tools/getos.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Determine OS and various other system properties.
 
 Determine the name of the platform used and other system properties such as
 the location of Chrome.  This is used, for example, to determine the correct
 Toolchain to invoke.
@@ skipping 126 matching lines @@
     # On Mac the nacl arch is currently always 32-bit.
     return 'x86_32'
 
   # On linux the nacl arch matches to chrome arch, so we inspect the chrome
   # binary using objdump
   chrome_path = GetChromePath(platform)
 
   # If CHROME_PATH is set to point to google-chrome or google-chrome
   # was found in the PATH and we are running on UNIX then google-chrome
   # is a bash script that points to 'chrome' in the same folder.
-  if os.path.basename(chrome_path) == 'google-chrome':
+  #
+  # When running beta or dev branch, the name is google-chrome-{beta,dev}.
+  if os.path.basename(chrome_path).startswith('google-chrome'):
     chrome_path = os.path.join(os.path.dirname(chrome_path), 'chrome')

[Sam Clegg, 2014/07/23 19:57:44]

Can we also check that it exists and is executable?

[binji, 2014/07/23 20:58:28]

Done.

 
   try:
     pobj = subprocess.Popen(['objdump', '-f', chrome_path],
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE)
     output, stderr = pobj.communicate()
     # error out here if objdump failed
     if pobj.returncode:
       raise Error(output + stderr.strip())
   except OSError as e:
@@ skipping 76 matching lines @@
     print out
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)