AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for building for tvOS

Browse Source 
This change is just to add support for building for tvOS.
It is exactly the same as iOS, just using a different SDK.

I had to change the two lines for libjpeg-turbo so that
it will run for both tvOS and iOS.

BUG=skia:

Change-Id: I6ae5fc4257df74c0f321e5d2d71584f6a52ec3a6
Reviewed-on: https://skia-review.googlesource.com/9660
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Matthew Leibowitz 2017-03-14 16:22:32 -04:00 committed by Skia Commit-Bot
parent dad29a059e
commit 3150ec6be9
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -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>

13
gn/BUILD.gn
View File

@ -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")
}

3
gn/BUILDCONFIG.gn
View File

@ -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"

4
third_party/libjpeg-turbo/BUILD.gn vendored
View File

@ -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",