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

Unified Diff: BUILD.gn

Issue 2296803002: GN: add sksl (Closed)
Patch Set: add tests 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 | gyp/sksl.gypi » ('j') | 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 67347ea251a47215d717fc3cf6c6b3f8d5214560..7f16f7b805d4b4bc28a6a13b18784f6fb068701d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,6 +68,7 @@ config("skia_private") {
"src/pdf",
"src/ports",
"src/sfnt",
+ "src/sksl",
"src/utils",
"src/utils/win",
"third_party/etc1",
@@ -134,6 +135,15 @@ pdf_gypi = exec_script("gn/gypi_to_gn.py",
"scope",
[ "gyp/pdf.gypi" ])
+sksl_gypi = exec_script("gn/gypi_to_gn.py",
+ [
+ rebase_path("gyp/sksl.gypi"),
+ "--replace=<(skia_include_path)=include",
+ "--replace=<(skia_src_path)=src",
+ ],
+ "scope",
+ [ "gyp/sksl.gypi" ])
+
utils_gypi = exec_script("gn/gypi_to_gn.py",
[
rebase_path("gyp/utils.gypi"),
@@ -410,6 +420,7 @@ component("skia") {
sources += core_gypi.sources
sources += effects_gypi.sources
sources += gpu_gypi.skgpu_sources
+ sources += sksl_gypi.sources
sources += utils_gypi.sources
sources += [
"src/android/SkBitmapRegionCodec.cpp",
@@ -688,8 +699,6 @@ if (skia_enable_tools) {
public_include_dirs = [ "tests" ]
sources = tests_sources - [
rebase_path("tests/PathOpsSkpClipTest.cpp"), # alternate main
- rebase_path("tests/SkSLErrorTest.cpp"), # TODO: make work
- rebase_path("tests/SkSLGLSLTest.cpp"), # TODO: make work
rebase_path("tests/SkpSkGrTest.cpp"), # doesn't compile
rebase_path("tests/skia_test.cpp"), # alternate main
]
« no previous file with comments | « no previous file | gyp/sksl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698