| OLD | NEW | 
|---|
| 1 # Copyright 2013 the V8 project authors. All rights reserved. | 1 # Copyright 2013 the V8 project authors. All rights reserved. | 
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without | 
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are | 
| 4 # met: | 4 # met: | 
| 5 # | 5 # | 
| 6 #     * Redistributions of source code must retain the above copyright | 6 #     * Redistributions of source code must retain the above copyright | 
| 7 #       notice, this list of conditions and the following disclaimer. | 7 #       notice, this list of conditions and the following disclaimer. | 
| 8 #     * Redistributions in binary form must reproduce the above | 8 #     * Redistributions in binary form must reproduce the above | 
| 9 #       copyright notice, this list of conditions and the following | 9 #       copyright notice, this list of conditions and the following | 
| 10 #       disclaimer in the documentation and/or other materials provided | 10 #       disclaimer in the documentation and/or other materials provided | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 93 | 93 | 
| 94     'variables': { | 94     'variables': { | 
| 95       # This is set when building the Android WebView inside the Android build | 95       # This is set when building the Android WebView inside the Android build | 
| 96       # system, using the 'android' gyp backend. | 96       # system, using the 'android' gyp backend. | 
| 97       'android_webview_build%': 0, | 97       'android_webview_build%': 0, | 
| 98     }, | 98     }, | 
| 99     # Copy it out one scope. | 99     # Copy it out one scope. | 
| 100     'android_webview_build%': '<(android_webview_build)', | 100     'android_webview_build%': '<(android_webview_build)', | 
| 101   }, | 101   }, | 
| 102   'conditions': [ | 102   'conditions': [ | 
| 103     ['host_arch=="ia32" or host_arch=="x64" or clang==1', { | 103     ['host_arch=="ia32" or host_arch=="x64" or \ | 
|  | 104       host_arch=="ppc" or host_arch=="ppc64" or \ | 
|  | 105       clang==1', { | 
| 104       'variables': { | 106       'variables': { | 
| 105         'host_cxx_is_biarch%': 1, | 107         'host_cxx_is_biarch%': 1, | 
| 106        }, | 108        }, | 
| 107      }, { | 109      }, { | 
| 108       'variables': { | 110       'variables': { | 
| 109         'host_cxx_is_biarch%': 0, | 111         'host_cxx_is_biarch%': 0, | 
| 110       }, | 112       }, | 
| 111     }], | 113     }], | 
| 112     ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \ | 114     ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \ | 
|  | 115       target_arch=="ppc" or target_arch=="ppc64" or \ | 
| 113       clang==1', { | 116       clang==1', { | 
| 114       'variables': { | 117       'variables': { | 
| 115         'target_cxx_is_biarch%': 1, | 118         'target_cxx_is_biarch%': 1, | 
| 116        }, | 119        }, | 
| 117      }, { | 120      }, { | 
| 118       'variables': { | 121       'variables': { | 
| 119         'target_cxx_is_biarch%': 0, | 122         'target_cxx_is_biarch%': 0, | 
| 120       }, | 123       }, | 
| 121     }], | 124     }], | 
| 122   ], | 125   ], | 
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 243               }], | 246               }], | 
| 244             ], | 247             ], | 
| 245           }],  # _toolset=="target" | 248           }],  # _toolset=="target" | 
| 246         ], | 249         ], | 
| 247       }],  # v8_target_arch=="arm" | 250       }],  # v8_target_arch=="arm" | 
| 248       ['v8_target_arch=="arm64"', { | 251       ['v8_target_arch=="arm64"', { | 
| 249         'defines': [ | 252         'defines': [ | 
| 250           'V8_TARGET_ARCH_ARM64', | 253           'V8_TARGET_ARCH_ARM64', | 
| 251         ], | 254         ], | 
| 252       }], | 255       }], | 
|  | 256       ['v8_target_arch=="ppc" or v8_target_arch=="ppc64"', { | 
|  | 257         'defines': [ | 
|  | 258           'V8_TARGET_ARCH_PPC', | 
|  | 259         ], | 
|  | 260         'conditions': [ | 
|  | 261           ['v8_target_arch=="ppc64"', { | 
|  | 262             'defines': [ | 
|  | 263               'V8_TARGET_ARCH_PPC64', | 
|  | 264             ], | 
|  | 265           }], | 
|  | 266           ['v8_host_byteorder=="little"', { | 
|  | 267             'defines': [ | 
|  | 268               'V8_TARGET_ARCH_PPC_LE', | 
|  | 269             ], | 
|  | 270           }], | 
|  | 271           ['v8_host_byteorder=="big"', { | 
|  | 272             'defines': [ | 
|  | 273               'V8_TARGET_ARCH_PPC_BE', | 
|  | 274             ], | 
|  | 275           }], | 
|  | 276         ], | 
|  | 277       }],  # ppc | 
| 253       ['v8_target_arch=="ia32"', { | 278       ['v8_target_arch=="ia32"', { | 
| 254         'defines': [ | 279         'defines': [ | 
| 255           'V8_TARGET_ARCH_IA32', | 280           'V8_TARGET_ARCH_IA32', | 
| 256         ], | 281         ], | 
| 257       }],  # v8_target_arch=="ia32" | 282       }],  # v8_target_arch=="ia32" | 
| 258       ['v8_target_arch=="x87"', { | 283       ['v8_target_arch=="x87"', { | 
| 259         'defines': [ | 284         'defines': [ | 
| 260           'V8_TARGET_ARCH_X87', | 285           'V8_TARGET_ARCH_X87', | 
| 261         ], | 286         ], | 
| 262         'cflags': ['-march=i586'], | 287         'cflags': ['-march=i586'], | 
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 583         'msvs_settings': { | 608         'msvs_settings': { | 
| 584           'VCLinkerTool': { | 609           'VCLinkerTool': { | 
| 585             'GenerateMapFile': 'true', | 610             'GenerateMapFile': 'true', | 
| 586           }, | 611           }, | 
| 587         }, | 612         }, | 
| 588       }], | 613       }], | 
| 589       ['(OS=="linux" or OS=="freebsd"  or OS=="openbsd" or OS=="solaris" \ | 614       ['(OS=="linux" or OS=="freebsd"  or OS=="openbsd" or OS=="solaris" \ | 
| 590          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ | 615          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ | 
| 591         (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ | 616         (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ | 
| 592          v8_target_arch=="x87" or v8_target_arch=="mips" or \ | 617          v8_target_arch=="x87" or v8_target_arch=="mips" or \ | 
| 593          v8_target_arch=="mipsel")', { | 618          v8_target_arch=="mipsel" or v8_target_arch=="ppc")', { | 
| 594         'target_conditions': [ | 619         'target_conditions': [ | 
| 595           ['_toolset=="host"', { | 620           ['_toolset=="host"', { | 
| 596             'conditions': [ | 621             'conditions': [ | 
| 597               ['host_cxx_is_biarch==1', { | 622               ['host_cxx_is_biarch==1', { | 
| 598                 'cflags': [ '-m32' ], | 623                 'cflags': [ '-m32' ], | 
| 599                 'ldflags': [ '-m32' ] | 624                 'ldflags': [ '-m32' ] | 
| 600               }], | 625               }], | 
| 601             ], | 626             ], | 
| 602             'xcode_settings': { | 627             'xcode_settings': { | 
| 603               'ARCHS': [ 'i386' ], | 628               'ARCHS': [ 'i386' ], | 
| 604             }, | 629             }, | 
| 605           }], | 630           }], | 
| 606           ['_toolset=="target"', { | 631           ['_toolset=="target"', { | 
| 607             'conditions': [ | 632             'conditions': [ | 
| 608               ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', { | 633               ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', { | 
| 609                 'cflags': [ '-m32' ], | 634                 'cflags': [ '-m32' ], | 
| 610                 'ldflags': [ '-m32' ], | 635                 'ldflags': [ '-m32' ], | 
| 611               }], | 636               }], | 
| 612             ], | 637             ], | 
| 613             'xcode_settings': { | 638             'xcode_settings': { | 
| 614               'ARCHS': [ 'i386' ], | 639               'ARCHS': [ 'i386' ], | 
| 615             }, | 640             }, | 
| 616           }], | 641           }], | 
| 617         ], | 642         ], | 
| 618       }], | 643       }], | 
| 619       ['(OS=="linux" or OS=="android") and \ | 644       ['(OS=="linux" or OS=="android") and \ | 
| 620         (v8_target_arch=="x64" or v8_target_arch=="arm64")', { | 645         (v8_target_arch=="x64" or v8_target_arch=="arm64" or \ | 
|  | 646          v8_target_arch=="ppc64")', { | 
| 621         'target_conditions': [ | 647         'target_conditions': [ | 
| 622           ['_toolset=="host"', { | 648           ['_toolset=="host"', { | 
| 623             'conditions': [ | 649             'conditions': [ | 
| 624               ['host_cxx_is_biarch==1', { | 650               ['host_cxx_is_biarch==1', { | 
| 625                 'cflags': [ '-m64' ], | 651                 'cflags': [ '-m64' ], | 
| 626                 'ldflags': [ '-m64' ] | 652                 'ldflags': [ '-m64' ] | 
| 627               }], | 653               }], | 
| 628              ], | 654              ], | 
| 629            }], | 655            }], | 
| 630            ['_toolset=="target"', { | 656            ['_toolset=="target"', { | 
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 951                 'OptimizeReferences': '2', | 977                 'OptimizeReferences': '2', | 
| 952                 'EnableCOMDATFolding': '2', | 978                 'EnableCOMDATFolding': '2', | 
| 953               }, | 979               }, | 
| 954             }, | 980             }, | 
| 955           }],  # OS=="win" | 981           }],  # OS=="win" | 
| 956         ],  # conditions | 982         ],  # conditions | 
| 957       },  # Release | 983       },  # Release | 
| 958     },  # configurations | 984     },  # configurations | 
| 959   },  # target_defaults | 985   },  # target_defaults | 
| 960 } | 986 } | 
| OLD | NEW | 
|---|