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

roll gn to latest

Browse Source 
Nice periodically, and this version also has a Mac arm64 binary.

Refine a few visibility rules from ":*" (any target in this file)
to "./*" (any target in any .gn file anywhere under this directory).

Use frameworks over libs where now required.

Change-Id: Ic19e1533e2810d18ae4684645d8555b422320b7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354536
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2021-01-15 07:20:33 -06:00 committed by Skia Commit-Bot
parent 73d57bf4e8
commit 4f4c064d5b
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BUILD.gn
View File

@ -69,11 +69,7 @@ config("skia_public") {
# Skia internal APIs, used by Skia itself and a few test tools. # Skia internal APIs, used by Skia itself and a few test tools.
config("skia_private") { config("skia_private") {
visibility = [ visibility = [ "./*" ]
":*",
"//modules/*",
"//experimental/*",
]
defines = [ "SK_GAMMA_APPLY_TO_A8" ] defines = [ "SK_GAMMA_APPLY_TO_A8" ]
if (skia_use_fixed_gamma_text) { if (skia_use_fixed_gamma_text) {
@ -100,7 +96,7 @@ config("skia_private") {
# Any code that's linked into Skia-the-library should use this config via += skia_library_configs. # Any code that's linked into Skia-the-library should use this config via += skia_library_configs.
config("skia_library") { config("skia_library") {
visibility = [ ":*" ] visibility = [ "./*" ]
defines = [ "SKIA_IMPLEMENTATION=1" ] defines = [ "SKIA_IMPLEMENTATION=1" ]
} }

2
bin/fetch-gn
View File

@ -24,7 +24,7 @@ with open(gnzip, 'wb') as f:
pkg = 'linux-amd64' if 'linux' in sys.platform else \ pkg = 'linux-amd64' if 'linux' in sys.platform else \
'mac-amd64' if 'darwin' in sys.platform else \ 'mac-amd64' if 'darwin' in sys.platform else \
'windows-amd64' 'windows-amd64'
rev = '9e993e3da82a9f4bc5c50c190afbcffd61e3d9e0' rev = 'd62642c920e6a0d1756316d225a90fd6faa9e21e'
url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/{}/+/git_revision:{}'.format(pkg,rev) url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/{}/+/git_revision:{}'.format(pkg,rev)
f.write(urlopen(url).read()) f.write(urlopen(url).read())

2
experimental/minimal_ios_mtl_skia_app/BUILD.gn
View File

@ -18,7 +18,7 @@ if (is_ios && skia_use_metal) {
"-std=c++14", "-std=c++14",
"-w", "-w",
] ]
libs = [ frameworks = [
"Metal.framework", "Metal.framework",
"MetalKit.framework", "MetalKit.framework",
"UIKit.framework", "UIKit.framework",

2
third_party/libsdl/BUILD.gn vendored
View File

@ -228,7 +228,7 @@ third_party("libsdl") {
"SDL_VIDEO_OPENGL_ES=1", "SDL_VIDEO_OPENGL_ES=1",
"SDL_VIDEO_OPENGL_ES2=1", "SDL_VIDEO_OPENGL_ES2=1",
] ]
libs += [ frameworks = [
"Foundation.framework", "Foundation.framework",
"QuartzCore.framework", "QuartzCore.framework",
"UIKit.framework", "UIKit.framework",

2
third_party/opencl/BUILD.gn vendored
View File

@ -8,7 +8,7 @@ third_party("opencl") {
if (is_linux) { if (is_linux) {
libs = [ "OpenCL" ] libs = [ "OpenCL" ]
} else if (is_mac) { } else if (is_mac) {
libs = [ "OpenCL.framework" ] frameworks = [ "OpenCL.framework" ]
} else if (is_win) { } else if (is_win) {
libs = [ "OpenCL.lib" ] libs = [ "OpenCL.lib" ]
} }

6
tools/skottie_ios_app/BUILD.gn
View File

@ -51,19 +51,19 @@ if (is_ios) {
"-std=c++14", "-std=c++14",
"-w", "-w",
] ]
libs = [ frameworks = [
"CoreFoundation.framework", "CoreFoundation.framework",
"Foundation.framework", "Foundation.framework",
"QuartzCore.framework", "QuartzCore.framework",
"UIKit.framework", "UIKit.framework",
] ]
if (skia_enable_gpu && skia_use_metal) { if (skia_enable_gpu && skia_use_metal) {
libs += [ frameworks += [
"Metal.framework", "Metal.framework",
"MetalKit.framework", "MetalKit.framework",
] ]
} else if (skia_enable_gpu && skia_use_gl) { } else if (skia_enable_gpu && skia_use_gl) {
libs += [ frameworks += [
"GLKit.framework", "GLKit.framework",
"OpenGLES.framework", "OpenGLES.framework",
] ]