diff options
| author |  brettw <brettw@chromium.org> | 2016-09-06 12:43:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-06 12:43:55 -0700 |
| commit | 45d1b442f1e0402ad7bc6a333ab86b32648c7a8c (patch) | |
| tree | 62a502e2017cc39d67fab03f6927d9e973d0e794 /gn/shared_sources.gni | |
| parent | 1dbb207babecdae8f1f74ed9d9900c73064df744 (diff) | |
Move uils and sksl to a common sources GYP file.
This is for the coalescing of sources in one GYP file to improve GN runtime. If
this is successful, the other sources lists will also be merged into this one
file.
Inlines "../src" and "../include" for skia_source_dir and skia_include_dir. Evaluating these with GYP's variable expansion is annoying since I think another layer of nesting is required. Coding these explicitly is also more clear. This used to be required because Chromium would reference these .gypi files directly with a different path, but this no longer happens.
Removes the chromium defines gypi which is no longer referenced.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302723005
Committed: https://skia.googlesource.com/skia/+/39f7a10a04a914384944d8bf62621144ac4eeaa3
Review-Url: https://codereview.chromium.org/2302723005
Diffstat (limited to 'gn/shared_sources.gni')
| -rw-r--r-- | gn/shared_sources.gni | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni index 8525883e7c..9a4af74538 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. |