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

Unified Diff: gn/shared_sources.gni

Issue 2302723005: Move uils and sksl to a common sources GYP file. (Closed)
Patch Set: Created 4 years, 3 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/skia_for_chromium_defines.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gn/shared_sources.gni
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 8525883e7c839ea10069a6d747c36eeafc2d7a82..9a4af745382c3f17c871c1df482f987dd577784f 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -69,27 +69,14 @@ _pdf_gypi = exec_script("gypi_to_gn.py",
[ "../gyp/pdf.gypi" ])
skia_pdf_sources = _pdf_gypi.sources
-# SKSL.
-_sksl_gypi = exec_script("gypi_to_gn.py",
+_sources_gypi = exec_script("gypi_to_gn.py",
[
- rebase_path("../gyp/sksl.gypi"),
- "--replace=<(skia_include_path)=$_path_to_include",
- "--replace=<(skia_src_path)=$_path_to_src",
+ rebase_path("../gyp/skia_sources.gypi"),
],
"scope",
- [ "../gyp/sksl.gypi" ])
-skia_sksl_sources = _sksl_gypi.sources
-
-# Utils.
-_utils_gypi = exec_script("gypi_to_gn.py",
- [
- rebase_path("../gyp/utils.gypi"),
- "--replace=<(skia_include_path)=$_path_to_include",
- "--replace=<(skia_src_path)=$_path_to_src",
- ],
- "scope",
- [ "../gyp/utils.gypi" ])
-skia_utils_sources = _utils_gypi.sources
+ [ "../gyp/skia_sources.gypi" ])
+skia_sksl_sources = get_path_info(_sources_gypi.sksl_sources, "abspath")
+skia_utils_sources = get_path_info(_sources_gypi.utils_sources, "abspath")
# Skia Chromium defines. These flags will be defined in chromium If these
# become 'permanent', they should be moved into Chrome's skia build file.
« no previous file with comments | « no previous file | gyp/skia_for_chromium_defines.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698