From 349cecefe21e2b45acc201290cc4e4fa93b4ad76 Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 26 Aug 2016 08:13:04 -0700 Subject: GN: mac host and armv7 target Just when I thought it wouldn't be useful to override ar... Tested by building 32- and 64-bit DM on my MBP and running it on my N5x. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2279703003 Review-Url: https://codereview.chromium.org/2279703003 --- gn/BUILDCONFIG.gn | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) (limited to 'gn/BUILDCONFIG.gn') diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 6aa4451e59..10f3244f55 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -22,9 +22,16 @@ if (current_os == "") { current_os = target_os } +is_android = current_os == "android" +is_fuchsia = current_os == "fuchsia" +is_ios = current_os == "ios" +is_linux = current_os == "linux" +is_mac = current_os == "mac" +is_win = current_os == "win" + if (target_cpu == "") { target_cpu = host_cpu - if (ndk != "") { + if (is_android) { target_cpu = "arm64" } } @@ -32,28 +39,49 @@ if (current_cpu == "") { current_cpu = target_cpu } -is_android = current_os == "android" -is_fuchsia = current_os == "fuchsia" -is_ios = current_os == "ios" -is_linux = current_os == "linux" -is_mac = current_os == "mac" -is_win = current_os == "win" - -is_posix = !is_win - if (is_android) { ndk_host = "" ndk_target = "" ndk_platform = "" ndk_stdlib = "" + nkd_gccdir = "" - if (host_os == "linux" && host_cpu == "x64") { + if (host_os == "linux") { ndk_host = "linux-x86_64" + } else if (host_os == "mac") { + ndk_host = "darwin-x86_64" } + if (target_cpu == "arm64") { ndk_target = "aarch64-linux-android" ndk_platform = "android-21/arch-arm64" ndk_stdlib = "arm64-v8a" + ndk_gccdir = ndk_target + } else if (target_cpu == "arm") { + ndk_target = "arm-linux-androideabi" + ndk_platform = "android-18/arch-arm" + ndk_stdlib = "armeabi-v7a" + ndk_gccdir = ndk_target + } else if (target_cpu == "mips64el") { + ndk_target = "mips64el-linux-android" + ndk_platform = "android-21/arch-mips64" + ndk_stdlib = "mips64" + ndk_gccdir = ndk_target + } else if (target_cpu == "mipsel") { + ndk_target = "mipsel-linux-android" + ndk_platform = "android-18/arch-mips" + ndk_stdlib = "mips" + ndk_gccdir = ndk_target + } else if (target_cpu == "x64") { + ndk_target = "x86_64-linux-android" + ndk_platform = "android-21/arch-x86_64" + ndk_stdlib = "x86_64" + ndk_gccdir = ndk_stdlib + } else if (target_cpu == "x86") { + ndk_target = "i686-linux-android" + ndk_platform = "android-18/arch-x86" + ndk_stdlib = "x86" + ndk_gccdir = ndk_stdlib } } -- cgit v1.2.3