diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | gn/BUILD.gn | 13 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 3 | ||||
| -rw-r--r-- | third_party/libjpeg-turbo/BUILD.gn | 4 |
4 files changed, 15 insertions, 6 deletions
@@ -26,6 +26,7 @@ Jacek Caban <cjacek@gmail.com> Jeff Muizelaar <jmuizelaar@mozilla.com> Lee Salzman <lsalzman@mozilla.com> Marcin Kazmierczak <mar.kazmierczak@gmail.com> +Matthew Leibowitz <mattleibow@live.com> MIPS <*@imgtec.com> NVIDIA <*@nvidia.com> Opera Software ASA <*@opera.com> diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 7741354097..36c881c5d7 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -50,9 +50,16 @@ if (!is_clang && !is_win) { } if (is_ios) { - sdk = "iphoneos" - if (target_cpu == "x86" || target_cpu == "x64") { - sdk = "iphonesimulator" + if (is_tvos) { + sdk = "appletvos" + if (target_cpu == "x86" || target_cpu == "x64") { + sdk = "appletvsimulator" + } + } else { + sdk = "iphoneos" + if (target_cpu == "x86" || target_cpu == "x64") { + sdk = "iphonesimulator" + } } ios_sysroot = exec_script("find_ios_sysroot.py", [ sdk ], "trim string") } diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 6ec5e67fe2..2b3ae33292 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -37,7 +37,8 @@ if (current_os == "") { is_android = current_os == "android" is_fuchsia = current_os == "fuchsia" -is_ios = current_os == "ios" +is_ios = current_os == "ios" || current_os == "tvos" +is_tvos = current_os == "tvos" is_linux = current_os == "linux" is_mac = current_os == "mac" is_win = current_os == "win" diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index 37b589d350..274b02b6bc 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -67,12 +67,12 @@ if (skia_use_system_libjpeg_turbo) { "../externals/libjpeg-turbo/jutils.c", ] - if (current_cpu == "arm" && current_os != "ios") { + if (current_cpu == "arm" && !is_ios) { sources += [ "../externals/libjpeg-turbo/simd/jsimd_arm.c", "../externals/libjpeg-turbo/simd/jsimd_arm_neon.S", ] - } else if (current_cpu == "arm64" && current_os != "ios") { + } else if (current_cpu == "arm64" && !is_ios) { sources += [ "../externals/libjpeg-turbo/simd/jsimd_arm64.c", "../externals/libjpeg-turbo/simd/jsimd_arm64_neon.S", |