Chromium Code Reviews| 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 """Install Debian sysroots for building chromium. | 6 """Install Debian sysroots for building chromium. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 # The sysroot is needed to ensure that binaries will run on Debian Wheezy, | 9 # The sysroot is needed to ensure that binaries will run on Debian Wheezy, |
| 10 # the oldest supported linux distribution. For ARM64 linux, we have Debian | 10 # the oldest supported linux distribution. For ARM64 linux, we have Debian |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 # since this is currently and android-only architecture. | 132 # since this is currently and android-only architecture. |
| 133 target_arch = DetectTargetArch() | 133 target_arch = DetectTargetArch() |
| 134 if target_arch and target_arch not in (host_arch, 'i386'): | 134 if target_arch and target_arch not in (host_arch, 'i386'): |
| 135 InstallDefaultSysrootForArch(target_arch) | 135 InstallDefaultSysrootForArch(target_arch) |
| 136 | 136 |
| 137 # Desktop Linux ozone builds require libxkbcommon* which is not | 137 # Desktop Linux ozone builds require libxkbcommon* which is not |
| 138 # available in Wheezy. | 138 # available in Wheezy. |
| 139 # TODO(thomasanderson): Remove this once the Jessie sysroot is used | 139 # TODO(thomasanderson): Remove this once the Jessie sysroot is used |
| 140 # by default. | 140 # by default. |
| 141 gyp_defines = gyp_chromium.GetGypVars(gyp_chromium.GetSupplementalFiles()) | 141 gyp_defines = gyp_chromium.GetGypVars(gyp_chromium.GetSupplementalFiles()) |
| 142 if gyp_defines.get('use_ozone') == '1': | 142 if gyp_defines.get('use_xkbcommon') == '1': |
|
Tom (Use chromium acct)
2017/02/03 00:36:12
This will not have the desired effect. use_xkbcom
tonikitoo
2017/02/03 04:29:27
Done.
| |
| 143 InstallSysroot('Jessie', 'amd64') | 143 InstallSysroot('Jessie', 'amd64') |
| 144 | 144 |
| 145 | 145 |
| 146 def main(args): | 146 def main(args): |
| 147 parser = optparse.OptionParser('usage: %prog [OPTIONS]', description=__doc__) | 147 parser = optparse.OptionParser('usage: %prog [OPTIONS]', description=__doc__) |
| 148 parser.add_option('--running-as-hook', action='store_true', | 148 parser.add_option('--running-as-hook', action='store_true', |
| 149 default=False, help='Used when running from gclient hooks.' | 149 default=False, help='Used when running from gclient hooks.' |
| 150 ' Installs default sysroot images.') | 150 ' Installs default sysroot images.') |
| 151 parser.add_option('--arch', type='choice', choices=VALID_ARCHS, | 151 parser.add_option('--arch', type='choice', choices=VALID_ARCHS, |
| 152 help='Sysroot architecture: %s' % ', '.join(VALID_ARCHS)) | 152 help='Sysroot architecture: %s' % ', '.join(VALID_ARCHS)) |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 238 with open(stamp, 'w') as s: | 238 with open(stamp, 'w') as s: |
| 239 s.write(url) | 239 s.write(url) |
| 240 | 240 |
| 241 | 241 |
| 242 if __name__ == '__main__': | 242 if __name__ == '__main__': |
| 243 try: | 243 try: |
| 244 sys.exit(main(sys.argv[1:])) | 244 sys.exit(main(sys.argv[1:])) |
| 245 except Error as e: | 245 except Error as e: |
| 246 sys.stderr.write(str(e) + '\n') | 246 sys.stderr.write(str(e) + '\n') |
| 247 sys.exit(1) | 247 sys.exit(1) |
| OLD | NEW |