| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 | 5 | 
| 6 # Script to install a Debian Wheezy sysroot for making official Google Chrome | 6 # Script to install a Debian Wheezy sysroot for making official Google Chrome | 
| 7 # Linux builds. | 7 # Linux builds. | 
| 8 # The sysroot is needed to make Chrome work for Debian Wheezy. | 8 # The sysroot is needed to make Chrome work for Debian Wheezy. | 
| 9 # This script can be run manually but is more often run as part of gclient | 9 # This script can be run manually but is more often run as part of gclient | 
| 10 # hooks. When run from hooks this script should be a no-op on non-linux | 10 # hooks. When run from hooks this script should be a no-op on non-linux | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68     return 'amd64' | 68     return 'amd64' | 
| 69   elif 'target_arch=ia32' in gyp_defines: | 69   elif 'target_arch=ia32' in gyp_defines: | 
| 70     return 'i386' | 70     return 'i386' | 
| 71   elif 'target_arch=arm' in gyp_defines: | 71   elif 'target_arch=arm' in gyp_defines: | 
| 72     return 'arm' | 72     return 'arm' | 
| 73   elif 'target_arch=mipsel' in gyp_defines: | 73   elif 'target_arch=mipsel' in gyp_defines: | 
| 74     return 'mips' | 74     return 'mips' | 
| 75 | 75 | 
| 76   # Figure out host arch using build/detect_host_arch.py and | 76   # Figure out host arch using build/detect_host_arch.py and | 
| 77   # set target_arch to host arch | 77   # set target_arch to host arch | 
| 78   SRC_DIR = os.path.abspath( | 78   build_dir = os.path.dirname(os.path.dirname(os.path.join(SCRIPT_DIR))) | 
| 79       os.path.join(SCRIPT_DIR, '..', '..', '..', '..')) | 79   sys.path.append(build_dir) | 
| 80   sys.path.append(os.path.join(SRC_DIR, 'build')) |  | 
| 81   import detect_host_arch | 80   import detect_host_arch | 
| 82 | 81 | 
| 83   detected_host_arch = detect_host_arch.HostArch() | 82   detected_host_arch = detect_host_arch.HostArch() | 
| 84   if detected_host_arch == 'x64': | 83   if detected_host_arch == 'x64': | 
| 85     return 'amd64' | 84     return 'amd64' | 
| 86   elif detected_host_arch == 'ia32': | 85   elif detected_host_arch == 'ia32': | 
| 87     return 'i386' | 86     return 'i386' | 
| 88   elif detected_host_arch == 'arm': | 87   elif detected_host_arch == 'arm': | 
| 89     return 'arm' | 88     return 'arm' | 
| 90   elif detected_host_arch == 'mips': | 89   elif detected_host_arch == 'mips': | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 185   parser = optparse.OptionParser('usage: %prog [OPTIONS]') | 184   parser = optparse.OptionParser('usage: %prog [OPTIONS]') | 
| 186   parser.add_option('--running-as-hook', action='store_true', | 185   parser.add_option('--running-as-hook', action='store_true', | 
| 187                     default=False, help='Used when running from gclient hooks.' | 186                     default=False, help='Used when running from gclient hooks.' | 
| 188                                         ' In this mode the sysroot will only ' | 187                                         ' In this mode the sysroot will only ' | 
| 189                                         'be installed for official Linux ' | 188                                         'be installed for official Linux ' | 
| 190                                         'builds or ARM Linux builds') | 189                                         'builds or ARM Linux builds') | 
| 191   parser.add_option('--arch', type='choice', choices=valid_archs, | 190   parser.add_option('--arch', type='choice', choices=valid_archs, | 
| 192                     help='Sysroot architecture: %s' % ', '.join(valid_archs)) | 191                     help='Sysroot architecture: %s' % ', '.join(valid_archs)) | 
| 193   options, _ = parser.parse_args() | 192   options, _ = parser.parse_args() | 
| 194   sys.exit(main()) | 193   sys.exit(main()) | 
| OLD | NEW | 
|---|