Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: BUILD.gn

Issue 2269213002: GN: Fix up Ganesh native interface hooks. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 692d0ba1be2c1d00f2de68689218ff55fe821399..21dd51256216ddc421fea15483c222b871c99cee 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -257,6 +257,7 @@ component("skia") {
"src/codec/SkSampler.cpp",
"src/codec/SkSwizzler.cpp",
"src/codec/SkWbmpCodec.cpp",
+ "src/gpu/gl/GrGLDefaultInterface_native.cpp",
"src/images/SkImageEncoder.cpp",
"src/images/SkImageEncoder_Factory.cpp",
"src/images/SkJPEGImageEncoder.cpp",
@@ -279,6 +280,10 @@ component("skia") {
"third_party/etc1/etc1.cpp",
"third_party/ktx/ktx.cpp",
]
+ sources -= [
+ "src/gpu/gl/GrGLCreateNativeInterface_none.cpp",
+ "src/gpu/gl/GrGLDefaultInterface_none.cpp",
+ ]
if (is_win) {
sources += [
@@ -309,7 +314,13 @@ component("skia") {
"third_party:fontconfig",
"third_party:freetype2",
]
+ libs += [
+ "GL",
+ "GLU",
+ "X11",
+ ]
sources += [
+ "src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp",
"src/ports/SkFontConfigInterface_direct.cpp",
"src/ports/SkFontConfigInterface_direct_factory.cpp",
"src/ports/SkFontHost_FreeType.cpp",
@@ -322,11 +333,15 @@ component("skia") {
if (is_mac) {
sources += [
+ "src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp",
"src/ports/SkFontHost_mac.cpp",
"src/ports/SkImageEncoder_CG.cpp",
"src/ports/SkImageGeneratorCG.cpp",
]
- libs += [ "ApplicationServices.framework" ]
+ libs += [
+ "ApplicationServices.framework",
+ "OpenGL.framework",
+ ]
}
if (is_fuchsia) {
@@ -413,21 +428,9 @@ test_lib("gpu_tool_utils") {
libs = []
if (is_linux) {
- sources += [
- "src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp",
- "tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp",
- ]
- libs += [
- "GL",
- "GLU",
- "X11",
- ]
+ sources += [ "tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp" ]
} else if (is_mac) {
- sources += [
- "src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp",
- "tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp",
- ]
- libs += [ "OpenGL.framework" ]
+ sources += [ "tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp" ]
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698