| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 }], | 313 }], |
| 314 ['OS=="android"', { | 314 ['OS=="android"', { |
| 315 # Location of Android NDK. | 315 # Location of Android NDK. |
| 316 'variables': { | 316 'variables': { |
| 317 'variables': { | 317 'variables': { |
| 318 # The Android toolchain needs to use the absolute path to the NDK | 318 # The Android toolchain needs to use the absolute path to the NDK |
| 319 # because it is used at different levels in the GYP files. | 319 # because it is used at different levels in the GYP files. |
| 320 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/', | 320 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/', |
| 321 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')", | 321 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')", |
| 322 # Version of the NDK. Used to ensure full rebuilds on NDK rolls. | 322 # Version of the NDK. Used to ensure full rebuilds on NDK rolls. |
| 323 'android_ndk_version%': 'r11c', | 323 'android_ndk_version%': 'r12b', |
| 324 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", | 324 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", |
| 325 'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/da
rwin/')", | 325 'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/da
rwin/')", |
| 326 }, | 326 }, |
| 327 | 327 |
| 328 # Copy conditionally-set variables out one scope. | 328 # Copy conditionally-set variables out one scope. |
| 329 'android_ndk_root%': '<(android_ndk_root)', | 329 'android_ndk_root%': '<(android_ndk_root)', |
| 330 'android_ndk_version%': '<(android_ndk_version)', | 330 'android_ndk_version%': '<(android_ndk_version)', |
| 331 'host_os%': '<(host_os)', | 331 'host_os%': '<(host_os)', |
| 332 'os_folder_name%': '<(os_folder_name)', | 332 'os_folder_name%': '<(os_folder_name)', |
| 333 | 333 |
| (...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1510 '-fsanitize=cfi-vcall', | 1510 '-fsanitize=cfi-vcall', |
| 1511 '-fsanitize=cfi-derived-cast', | 1511 '-fsanitize=cfi-derived-cast', |
| 1512 '-fsanitize=cfi-unrelated-cast', | 1512 '-fsanitize=cfi-unrelated-cast', |
| 1513 ], | 1513 ], |
| 1514 }], | 1514 }], |
| 1515 ], | 1515 ], |
| 1516 }, | 1516 }, |
| 1517 }], | 1517 }], |
| 1518 ], | 1518 ], |
| 1519 } | 1519 } |
| OLD | NEW |