| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 # | 2 # | 
| 3 # Copyright 2014 The LibYuv Project Authors. All rights reserved. | 3 # Copyright 2014 The LibYuv Project Authors. All rights reserved. | 
| 4 # | 4 # | 
| 5 # Use of this source code is governed by a BSD-style license | 5 # Use of this source code is governed by a BSD-style license | 
| 6 # that can be found in the LICENSE file in the root of the source | 6 # that can be found in the LICENSE file in the root of the source | 
| 7 # tree. An additional intellectual property rights grant can be found | 7 # tree. An additional intellectual property rights grant can be found | 
| 8 # in the file PATENTS. All contributing project authors may | 8 # in the file PATENTS. All contributing project authors may | 
| 9 # be found in the AUTHORS file in the root of the source tree. | 9 # be found in the AUTHORS file in the root of the source tree. | 
| 10 | 10 | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 30   """Returns a list of the supplemental files that are included in all GYP | 30   """Returns a list of the supplemental files that are included in all GYP | 
| 31   sources.""" | 31   sources.""" | 
| 32   # Can't use the one in gyp_chromium since the directory location of the root | 32   # Can't use the one in gyp_chromium since the directory location of the root | 
| 33   # is different. | 33   # is different. | 
| 34   return glob.glob(os.path.join(checkout_root, '*', 'supplement.gypi')) | 34   return glob.glob(os.path.join(checkout_root, '*', 'supplement.gypi')) | 
| 35 | 35 | 
| 36 | 36 | 
| 37 if __name__ == '__main__': | 37 if __name__ == '__main__': | 
| 38   args = sys.argv[1:] | 38   args = sys.argv[1:] | 
| 39 | 39 | 
|  | 40   if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)): | 
|  | 41     print 'Skipping gyp_libyuv due to GYP_CHROMIUM_NO_ACTION env var.' | 
|  | 42     sys.exit(0) | 
|  | 43 | 
| 40   # This could give false positives since it doesn't actually do real option | 44   # This could give false positives since it doesn't actually do real option | 
| 41   # parsing.  Oh well. | 45   # parsing.  Oh well. | 
| 42   gyp_file_specified = False | 46   gyp_file_specified = False | 
| 43   for arg in args: | 47   for arg in args: | 
| 44     if arg.endswith('.gyp'): | 48     if arg.endswith('.gyp'): | 
| 45       gyp_file_specified = True | 49       gyp_file_specified = True | 
| 46       break | 50       break | 
| 47 | 51 | 
| 48   # If we didn't get a file, assume 'all.gyp' in the root of the checkout. | 52   # If we didn't get a file, assume 'all.gyp' in the root of the checkout. | 
| 49   if not gyp_file_specified: | 53   if not gyp_file_specified: | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 88   # Off we go... | 92   # Off we go... | 
| 89   gyp_rc = gyp.main(args) | 93   gyp_rc = gyp.main(args) | 
| 90 | 94 | 
| 91   if vs2013_runtime_dll_dirs: | 95   if vs2013_runtime_dll_dirs: | 
| 92     x64_runtime, x86_runtime = vs2013_runtime_dll_dirs | 96     x64_runtime, x86_runtime = vs2013_runtime_dll_dirs | 
| 93     vs_toolchain.CopyVsRuntimeDlls( | 97     vs_toolchain.CopyVsRuntimeDlls( | 
| 94         os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()), | 98         os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()), | 
| 95         (x86_runtime, x64_runtime)) | 99         (x86_runtime, x64_runtime)) | 
| 96 | 100 | 
| 97   sys.exit(gyp_rc) | 101   sys.exit(gyp_rc) | 
| OLD | NEW | 
|---|