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() { |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir" | 41 sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir" |
| 42 } else if (current_cpu == "mips64el") { | 42 } else if (current_cpu == "mips64el") { |
| 43 sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir" | 43 sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir" |
| 44 } else { | 44 } else { |
| 45 sysroot = "" | 45 sysroot = "" |
| 46 } | 46 } |
| 47 } else if (is_linux && use_sysroot) { | 47 } else if (is_linux && use_sysroot) { |
| 48 # By default build against a sysroot image downloaded from Cloud Storage | 48 # By default build against a sysroot image downloaded from Cloud Storage |
| 49 # during gclient runhooks. | 49 # during gclient runhooks. |
| 50 if (is_chromeos) { | 50 if (is_chromeos) { |
| 51 # Regular ChromeOS builds use custom sysroots, but desktop ChromeOS (where | 51 import("//ui/ozone/ozone.gni") |
|
Tom (Use chromium acct)
2017/01/18 19:02:18
Move the added code into the else block (!is_chrom
tonikitoo
2017/01/20 20:26:21
Done.
| |
| 52 # we're building linux desktop binaries but using the ChromeOS UI and | 52 if (use_ozone && ozone_platform_wayland) { |
| 53 # functionality where possible) needs to run on the buliders, which are | 53 sysroot = "//build/linux/debian_jessie_amd64-sysroot" |
| 54 # running precise. The precise build has a different set of dependencies | 54 } else { |
| 55 # from the wheezy build, so we cannot use the wheezy sysroot. | 55 # Regular ChromeOS builds use custom sysroots, but desktop ChromeOS (where |
| 56 sysroot = "//build/linux/ubuntu_precise_amd64-sysroot" | 56 # we're building linux desktop binaries but using the ChromeOS UI and |
| 57 # functionality where possible) needs to run on the buliders, which are | |
| 58 # running precise. The precise build has a different set of dependencies | |
| 59 # from the wheezy build, so we cannot use the wheezy sysroot. | |
| 60 sysroot = "//build/linux/ubuntu_precise_amd64-sysroot" | |
| 61 } | |
| 57 } else { | 62 } else { |
| 58 if (current_cpu == "x64") { | 63 if (current_cpu == "x64") { |
| 59 sysroot = "//build/linux/debian_wheezy_amd64-sysroot" | 64 sysroot = "//build/linux/debian_wheezy_amd64-sysroot" |
| 60 } else if (current_cpu == "x86") { | 65 } else if (current_cpu == "x86") { |
| 61 sysroot = "//build/linux/debian_wheezy_i386-sysroot" | 66 sysroot = "//build/linux/debian_wheezy_i386-sysroot" |
| 62 } else if (current_cpu == "mipsel") { | 67 } else if (current_cpu == "mipsel") { |
| 63 sysroot = "//build/linux/debian_wheezy_mips-sysroot" | 68 sysroot = "//build/linux/debian_wheezy_mips-sysroot" |
| 64 } else if (current_cpu == "arm") { | 69 } else if (current_cpu == "arm") { |
| 65 sysroot = "//build/linux/debian_wheezy_arm-sysroot" | 70 sysroot = "//build/linux/debian_wheezy_arm-sysroot" |
| 66 } else if (current_cpu == "arm64") { | 71 } else if (current_cpu == "arm64") { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 92 } | 97 } |
| 93 } else if (is_mac) { | 98 } else if (is_mac) { |
| 94 import("//build/config/mac/mac_sdk.gni") | 99 import("//build/config/mac/mac_sdk.gni") |
| 95 sysroot = mac_sdk_path | 100 sysroot = mac_sdk_path |
| 96 } else if (is_ios) { | 101 } else if (is_ios) { |
| 97 import("//build/config/ios/ios_sdk.gni") | 102 import("//build/config/ios/ios_sdk.gni") |
| 98 sysroot = ios_sdk_path | 103 sysroot = ios_sdk_path |
| 99 } else { | 104 } else { |
| 100 sysroot = "" | 105 sysroot = "" |
| 101 } | 106 } |
| OLD | NEW |