Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 # This header file defines the "sysroot" variable which is the absolute path | 5 # This header file defines the "sysroot" variable which is the absolute path |
| 6 # of the sysroot. If no sysroot applies, the variable will be an empty string. | 6 # of the sysroot. If no sysroot applies, the variable will be an empty string. |
| 7 | 7 |
| 8 import("//build/config/chrome_build.gni") | 8 import("//build/config/chrome_build.gni") |
| 9 | 9 |
| 10 declare_args() { | 10 declare_args() { |
| 11 # The absolute path of the sysroot that is applied when compiling using | 11 # The absolute path of the sysroot that is applied when compiling using |
| 12 # the target toolchain. | 12 # the target toolchain. |
| 13 target_sysroot = "" | 13 target_sysroot = "" |
| 14 use_sysroot = true | 14 use_sysroot = true |
| 15 } | 15 } |
| 16 | 16 |
| 17 if (current_os == target_os && current_cpu == target_cpu && | 17 if (target_sysroot != "") { |
|
Dirk Pranke
2016/06/23 16:22:43
I think this probably has the same problem.
| |
| 18 target_sysroot != "") { | |
| 19 sysroot = target_sysroot | 18 sysroot = target_sysroot |
| 20 } else if (is_android) { | 19 } else if (is_android) { |
| 21 import("//build/config/android/config.gni") | 20 import("//build/config/android/config.gni") |
| 22 if (current_cpu == "x86") { | 21 if (current_cpu == "x86") { |
| 23 sysroot = "$android_ndk_root/$x86_android_sysroot_subdir" | 22 sysroot = "$android_ndk_root/$x86_android_sysroot_subdir" |
| 24 } else if (current_cpu == "arm") { | 23 } else if (current_cpu == "arm") { |
| 25 sysroot = "$android_ndk_root/$arm_android_sysroot_subdir" | 24 sysroot = "$android_ndk_root/$arm_android_sysroot_subdir" |
| 26 } else if (current_cpu == "mipsel") { | 25 } else if (current_cpu == "mipsel") { |
| 27 sysroot = "$android_ndk_root/$mips_android_sysroot_subdir" | 26 sysroot = "$android_ndk_root/$mips_android_sysroot_subdir" |
| 28 } else if (current_cpu == "x64") { | 27 } else if (current_cpu == "x64") { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 } | 72 } |
| 74 } else if (is_mac) { | 73 } else if (is_mac) { |
| 75 import("//build/config/mac/mac_sdk.gni") | 74 import("//build/config/mac/mac_sdk.gni") |
| 76 sysroot = mac_sdk_path | 75 sysroot = mac_sdk_path |
| 77 } else if (is_ios) { | 76 } else if (is_ios) { |
| 78 import("//build/config/ios/ios_sdk.gni") | 77 import("//build/config/ios/ios_sdk.gni") |
| 79 sysroot = ios_sdk_path | 78 sysroot = ios_sdk_path |
| 80 } else { | 79 } else { |
| 81 sysroot = "" | 80 sysroot = "" |
| 82 } | 81 } |
| OLD | NEW |