diff options
author | dpranke <dpranke@chromium.org> | 2015-02-19 18:55:19 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 02:56:07 +0000 |
commit | 4327621a322c964a8bc6d1ef5a4534f0f877d63e (patch) | |
tree | eb4397f38579a5d7dcb821a8873e4006187dd450 /build/config/sysroot.gni | |
parent | 05b60060481868d9d6892f05e25e33e7934d1284 (diff) | |
download | chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.zip chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.gz chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.bz2 |
Update Chomium's build files to work w/ latest GN binaries.
The latest GN binaries rename cpu_arch to current_cpu and/or target_cpu
as appropriate, build_cpu_arch to host_cpu, and os to current_os and target_os as appropriate.
R=brettw@chromium.org
TBR=ddorwin@chromium.org
EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
BUG=344767
Review URL: https://codereview.chromium.org/913373002
Cr-Commit-Position: refs/heads/master@{#317223}
Diffstat (limited to 'build/config/sysroot.gni')
-rw-r--r-- | build/config/sysroot.gni | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index a9b250c..941c77a 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -16,17 +16,17 @@ if (current_toolchain == default_toolchain && target_sysroot != "") { } else if (is_android) { import("//build/config/android/config.gni") if (!is_android_webview_build) { - if (cpu_arch == "x86") { + if (current_cpu == "x86") { sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir") - } else if (cpu_arch == "arm") { + } else if (current_cpu == "arm") { sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir") - } else if (cpu_arch == "mipsel") { + } else if (current_cpu == "mipsel") { sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir") - } else if (cpu_arch == "x64") { + } else if (current_cpu == "x64") { sysroot = rebase_path("$android_ndk_root/$x86_64_android_sysroot_subdir") - } else if (cpu_arch == "arm64") { + } else if (current_cpu == "arm64") { sysroot = rebase_path("$android_ndk_root/$arm64_android_sysroot_subdir") - } else if (cpu_arch == "mips64") { + } else if (current_cpu == "mips64") { sysroot = rebase_path("$android_ndk_root/$mips64_android_sysroot_subdir") } else { sysroot = "" @@ -37,17 +37,17 @@ if (current_toolchain == default_toolchain && target_sysroot != "") { } else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) { # For official builds, use the sysroot checked into the internal source repo # so that the builds work on older versions of Linux. - if (cpu_arch == "x64") { + if (current_cpu == "x64") { sysroot = rebase_path("//chrome/installer/linux/debian_wheezy_amd64-sysroot") - } else if (cpu_arch == "x86") { + } else if (current_cpu == "x86") { sysroot = rebase_path("//chrome/installer/linux/debian_wheezy_i386-sysroot") } else { # Any other builds don't use a sysroot. sysroot = "" } } else if (is_linux && !is_chromeos) { - if (cpu_arch == "mipsel") { + if (current_cpu == "mipsel") { sysroot = rebase_path("//mipsel-sysroot/sysroot") } else { sysroot = "" |