| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 # Use of this source code is governed by a BSD-style license that can be |     2 # Use of this source code is governed by a BSD-style license that can be | 
|     3 # found in the LICENSE file. |     3 # found in the LICENSE file. | 
|     4  |     4  | 
|     5 # IMPORTANT: |     5 # IMPORTANT: | 
|     6 # Please don't directly include this file if you are building via gyp_chromium, |     6 # Please don't directly include this file if you are building via gyp_chromium, | 
|     7 # since gyp_chromium is automatically forcing its inclusion. |     7 # since gyp_chromium is automatically forcing its inclusion. | 
|     8 { |     8 { | 
|     9   # Variables expected to be overriden on the GYP command line (-D) or by |     9   # Variables expected to be overriden on the GYP command line (-D) or by | 
|    10   # ~/.gyp/include.gypi. |    10   # ~/.gyp/include.gypi. | 
| (...skipping 4093 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4104               }], |  4104               }], | 
|  4105             ], |  4105             ], | 
|  4106           }], |  4106           }], | 
|  4107           ['target_arch=="mipsel"', { |  4107           ['target_arch=="mipsel"', { | 
|  4108             'target_conditions': [ |  4108             'target_conditions': [ | 
|  4109               ['_toolset=="target"', { |  4109               ['_toolset=="target"', { | 
|  4110                 'conditions': [ |  4110                 'conditions': [ | 
|  4111                   ['mips_arch_variant=="r6"', { |  4111                   ['mips_arch_variant=="r6"', { | 
|  4112                     'conditions': [ |  4112                     'conditions': [ | 
|  4113                       ['clang==1', { |  4113                       ['clang==1', { | 
|  4114                         'cflags': [ '-target mipsel-linux-gnu', '-march=mips32r6
      ', ], |  4114                         'conditions': [ | 
|  4115                         'ldflags': [ '-target mipsel-linux-gnu', ], |  4115                           ['OS=="android"', { | 
 |  4116                             'cflags': [ '-target mipsel-linux-android', '-march=
      mipsel', '-mcpu=mips32r6', ], | 
 |  4117                             'ldflags': [ '-target mipsel-linux-android', ], | 
 |  4118                           }], | 
 |  4119                         ], | 
|  4116                       }, { # clang==0 |  4120                       }, { # clang==0 | 
|  4117                         'cflags': ['-mips32r6', '-Wa,-mips32r6', ], |  4121                         'cflags': ['-mips32r6', '-Wa,-mips32r6', ], | 
|  4118                       }], |  4122                       }], | 
|  4119                       ['clang==0 and OS=="android"', { |  4123                       ['clang==0 and OS=="android"', { | 
|  4120                         'ldflags': ['-mips32r6', '-Wl,-melf32ltsmip',], |  4124                         'ldflags': ['-mips32r6', '-Wl,-melf32ltsmip',], | 
|  4121                       }], |  4125                       }], | 
|  4122                     ], |  4126                     ], | 
 |  4127                     'cflags': [ '-mfp64', '-mno-odd-spreg' ], | 
 |  4128                     'ldflags': [ '-mfp64', '-mno-odd-spreg' ], | 
|  4123                   }], |  4129                   }], | 
|  4124                   ['mips_arch_variant=="r2"', { |  4130                   ['mips_arch_variant=="r2"', { | 
|  4125                     'conditions': [ |  4131                     'conditions': [ | 
|  4126                       ['mips_float_abi=="hard" and mips_fpu_mode!=""', { |  4132                       ['mips_float_abi=="hard" and mips_fpu_mode!=""', { | 
|  4127                         'cflags': ['-m<(mips_fpu_mode)'], |  4133                         'cflags': ['-m<(mips_fpu_mode)'], | 
|  4128                       }], |  4134                       }], | 
|  4129                       ['clang==1', { |  4135                       ['clang==1', { | 
|  4130                          'conditions': [ |  4136                          'conditions': [ | 
|  4131                           ['OS=="android"', { |  4137                           ['OS=="android"', { | 
|  4132                             'cflags': [ '-target mipsel-linux-android', '-march=
      mipsel', '-mcpu=mips32r2'], |  4138                             'cflags': [ '-target mipsel-linux-android', '-march=
      mipsel', '-mcpu=mips32r2'], | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4204                   }], |  4210                   }], | 
|  4205                 ], |  4211                 ], | 
|  4206               }], |  4212               }], | 
|  4207             ], |  4213             ], | 
|  4208           }], |  4214           }], | 
|  4209           ['target_arch=="mips64el"', { |  4215           ['target_arch=="mips64el"', { | 
|  4210             'target_conditions': [ |  4216             'target_conditions': [ | 
|  4211               ['_toolset=="target"', { |  4217               ['_toolset=="target"', { | 
|  4212                 'conditions': [ |  4218                 'conditions': [ | 
|  4213                   ['mips_arch_variant=="r6"', { |  4219                   ['mips_arch_variant=="r6"', { | 
|  4214                     'cflags': ['-mips64r6', '-Wa,-mips64r6'], |  4220                     'conditions': [ | 
|  4215                     'ldflags': ['-mips64r6'], |  4221                       ['clang==1', { | 
 |  4222                         'conditions': [ | 
 |  4223                           ['OS=="android"', { | 
 |  4224                             'cflags': [ '-target mips64el-linux-android', '-marc
      h=mips64el', '-mcpu=mips64r6', ], | 
 |  4225                             'ldflags': [ '-target mips64el-linux-android', ], | 
 |  4226                           }], | 
 |  4227                         ], | 
 |  4228                       }, { # clang==0 | 
 |  4229                         'cflags': ['-mips64r6', '-Wa,-mips64r6'], | 
 |  4230                         'ldflags': ['-mips64r6'], | 
 |  4231                       }], | 
 |  4232                     ], | 
|  4216                   }], |  4233                   }], | 
|  4217                   ['mips_arch_variant=="r2"', { |  4234                   ['mips_arch_variant=="r2"', { | 
|  4218                     'cflags': ['-mips64r2', '-Wa,-mips64r2'], |  4235                     'cflags': ['-mips64r2', '-Wa,-mips64r2'], | 
|  4219                     'ldflags': ['-mips64r2'], |  4236                     'ldflags': ['-mips64r2'], | 
|  4220                   }], |  4237                   }], | 
 |  4238                   ['clang==1', { | 
 |  4239                     'cflags!': [ | 
 |  4240                       # Clang does not support the following options. | 
 |  4241                       '-finline-limit=64', | 
 |  4242                     ], | 
 |  4243                     # TODO(gordanac) Enable integrated-as. | 
 |  4244                     'cflags': [ '-fno-integrated-as' ], | 
 |  4245                     'conditions': [ | 
 |  4246                       ['OS=="android"', { | 
 |  4247                         'cflags': [ | 
 |  4248                           # Else /usr/bin/as gets picked up. | 
 |  4249                           '-B<(android_toolchain)', | 
 |  4250                         ], | 
 |  4251                       }], | 
 |  4252                     ], | 
 |  4253                   }], | 
 |  4254                   ['clang==1 and OS=="android"', { | 
 |  4255                     'ldflags': [ | 
 |  4256                       # Let clang find the ld in the NDK. | 
 |  4257                       '--gcc-toolchain=<(android_toolchain)/..', | 
 |  4258                     ], | 
 |  4259                   }], | 
|  4221                 ], |  4260                 ], | 
 |  4261  | 
|  4222                 'cflags_cc': [ |  4262                 'cflags_cc': [ | 
|  4223                   '-Wno-uninitialized', |  4263                   '-Wno-uninitialized', | 
|  4224                 ], |  4264                 ], | 
|  4225               }], |  4265               }], | 
|  4226             ], |  4266             ], | 
|  4227           }], |  4267           }], | 
|  4228           ['linux_fpic==1', { |  4268           ['linux_fpic==1', { | 
|  4229             'cflags': [ |  4269             'cflags': [ | 
|  4230               '-fPIC', |  4270               '-fPIC', | 
|  4231             ], |  4271             ], | 
| (...skipping 2064 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  6296     # settings in target dicts.  SYMROOT is a special case, because many other |  6336     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  6297     # Xcode variables depend on it, including variables such as |  6337     # Xcode variables depend on it, including variables such as | 
|  6298     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  6338     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  6299     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  6339     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  6300     # files to appear (when present) in the UI as actual files and not red |  6340     # files to appear (when present) in the UI as actual files and not red | 
|  6301     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  6341     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  6302     # and therefore SYMROOT, needs to be set at the project level. |  6342     # and therefore SYMROOT, needs to be set at the project level. | 
|  6303     'SYMROOT': '<(DEPTH)/xcodebuild', |  6343     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  6304   }, |  6344   }, | 
|  6305 } |  6345 } | 
| OLD | NEW |