diff options
| author | torne <torne@chromium.org> | 2015-03-31 04:50:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-31 11:51:32 +0000 |
| commit | c6fe7a775af41cd98533e89a902b8b67044caa87 (patch) | |
| tree | d823a24922f73807350a0b725021fc338ded49b0 /build/config/sysroot.gni | |
| parent | 887f8c314715f50be9ff08c08c6351a6f4498593 (diff) | |
| download | chromium_src-c6fe7a775af41cd98533e89a902b8b67044caa87.zip chromium_src-c6fe7a775af41cd98533e89a902b8b67044caa87.tar.gz chromium_src-c6fe7a775af41cd98533e89a902b8b67044caa87.tar.bz2 | |
Remove most android_webview_build conditions from build.
Remove most references to android_webview_build from the build directory
now that we no longer support that build configuration. Fold conditions
into their parents where appropriate. Leave the variable itself defined
to 0 as not all uses in the tree have been removed yet.
A few references are left alone here and will be removed separately in
later changes that will be larger refactorings to eliminate other
variables.
BUG=440793
Review URL: https://codereview.chromium.org/1043913002
Cr-Commit-Position: refs/heads/master@{#323013}
Diffstat (limited to 'build/config/sysroot.gni')
| -rw-r--r-- | build/config/sysroot.gni | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 941c77a..057971d 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -15,22 +15,18 @@ if (current_toolchain == default_toolchain && target_sysroot != "") { sysroot = target_sysroot } else if (is_android) { import("//build/config/android/config.gni") - if (!is_android_webview_build) { - if (current_cpu == "x86") { - sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir") - } else if (current_cpu == "arm") { - sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir") - } else if (current_cpu == "mipsel") { - sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir") - } else if (current_cpu == "x64") { - sysroot = rebase_path("$android_ndk_root/$x86_64_android_sysroot_subdir") - } else if (current_cpu == "arm64") { - sysroot = rebase_path("$android_ndk_root/$arm64_android_sysroot_subdir") - } else if (current_cpu == "mips64") { - sysroot = rebase_path("$android_ndk_root/$mips64_android_sysroot_subdir") - } else { - sysroot = "" - } + if (current_cpu == "x86") { + sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir") + } else if (current_cpu == "arm") { + sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir") + } else if (current_cpu == "mipsel") { + sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir") + } else if (current_cpu == "x64") { + sysroot = rebase_path("$android_ndk_root/$x86_64_android_sysroot_subdir") + } else if (current_cpu == "arm64") { + sysroot = rebase_path("$android_ndk_root/$arm64_android_sysroot_subdir") + } else if (current_cpu == "mips64") { + sysroot = rebase_path("$android_ndk_root/$mips64_android_sysroot_subdir") } else { sysroot = "" } |