diff options
| author | scottmg <scottmg@chromium.org> | 2014-12-03 15:27:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-03 23:27:41 +0000 |
| commit | 34fb7e5919ed42dc800acf3961fe6a2bf9e7d6eb (patch) | |
| tree | dc6a3e4de8e3093074390b933e9d4cb0e79070f5 /build/config/android/config.gni | |
| parent | e00b5de3d64b4ea58797b13f42039956a5b3ddec (diff) | |
| download | chromium_src-34fb7e5919ed42dc800acf3961fe6a2bf9e7d6eb.zip chromium_src-34fb7e5919ed42dc800acf3961fe6a2bf9e7d6eb.tar.gz chromium_src-34fb7e5919ed42dc800acf3961fe6a2bf9e7d6eb.tar.bz2 | |
gn format // (the rest, except mojo)
Excluded mojo because I think that needs to happen on the other side.
At gn --version = 306668 for which roll is in CQ.
R=brettw@chromium.org
TBR=scherkus@chromium.org
BUG=348474
Review URL: https://codereview.chromium.org/774353003
Cr-Commit-Position: refs/heads/master@{#306708}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni index e2bd165..82405dd 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -95,12 +95,9 @@ if (is_android) { # Toolchain root directory for each build. The actual binaries are inside # a "bin" directory inside of these. _android_toolchain_version = "4.9" - x86_android_toolchain_root = - "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" - arm_android_toolchain_root = - "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" - mips_android_toolchain_root = - "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" + x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" + arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" + mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}" # Location of libgcc. This is only needed for the current GN toolchain, so we # only need to define the current one, rather than one for every platform @@ -109,20 +106,17 @@ if (is_android) { android_prebuilt_arch = "android-x86" _binary_prefix = "i686-linux-android" android_toolchain_root = "$x86_android_toolchain_root" - android_libgcc_file = - "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a" + android_libgcc_file = "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a" } else if (cpu_arch == "arm") { android_prebuilt_arch = "android-arm" _binary_prefix = "arm-linux-androideabi" android_toolchain_root = "$arm_android_toolchain_root" - android_libgcc_file = - "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a" + android_libgcc_file = "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a" } else if (cpu_arch == "mipsel") { android_prebuilt_arch = "android-mips" _binary_prefix = "mipsel-linux-android" android_toolchain_root = "$mips_android_toolchain_root" - android_libgcc_file = - "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a" + android_libgcc_file = "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a" } else { assert(false, "Need android libgcc support for your target arch.") } |