diff options
| author | halton.huo <halton.huo@intel.com> | 2015-02-10 16:08:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-11 00:09:18 +0000 |
| commit | 98de73d11797b1b0ac7ac0b2f4234cb8f57bd2fc (patch) | |
| tree | 342904afed4926161a27d2b7a33dc853b7cfd534 /build/config/sysroot.gni | |
| parent | e8b2c284894dd80000299c72c45f43bbd7d5ba91 (diff) | |
| download | chromium_src-98de73d11797b1b0ac7ac0b2f4234cb8f57bd2fc.zip chromium_src-98de73d11797b1b0ac7ac0b2f4234cb8f57bd2fc.tar.gz chromium_src-98de73d11797b1b0ac7ac0b2f4234cb8f57bd2fc.tar.bz2 | |
Add GN build support for Android 64-bit platforms.
gn now run with arg target_arch = "x64", arm64 and mips64el
releated changes are added as well but not verified.
BUG=none
Review URL: https://codereview.chromium.org/864173006
Cr-Commit-Position: refs/heads/master@{#315680}
Diffstat (limited to 'build/config/sysroot.gni')
| -rw-r--r-- | build/config/sysroot.gni | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 77032f7..a9b250c 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -22,6 +22,12 @@ if (current_toolchain == default_toolchain && target_sysroot != "") { sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir") } else if (cpu_arch == "mipsel") { sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir") + } else if (cpu_arch == "x64") { + sysroot = rebase_path("$android_ndk_root/$x86_64_android_sysroot_subdir") + } else if (cpu_arch == "arm64") { + sysroot = rebase_path("$android_ndk_root/$arm64_android_sysroot_subdir") + } else if (cpu_arch == "mips64") { + sysroot = rebase_path("$android_ndk_root/$mips64_android_sysroot_subdir") } else { sysroot = "" } |