diff options
| author |  caryclark <caryclark@google.com> | 2016-09-06 07:07:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-06 07:07:52 -0700 |
| commit | e6088c6063b60f58411936af9c48841131a5e001 (patch) | |
| tree | 725341412a6b99b57ea2f8aaa6e15b52bc80f72e /gn/shared_sources.gni | |
| parent | 5a3c528f5661a0d5843ecab9567c40c96a9d881e (diff) | |
Revert of Move uils and sksl to a common sources GYP file. (patchset #1 id:1 of https://codereview.chromium.org/2302723005/ )
Reason for revert:
The broke the PDFium build. See
https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-PDFium/builds/2094
Original issue's description:
> 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
TBR=mtklein@chromium.org,brettw@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
Review-Url: https://codereview.chromium.org/2317683002
Diffstat (limited to 'gn/shared_sources.gni')
| -rw-r--r-- | gn/shared_sources.gni | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni index 9a4af74538..8525883e7c 100644 --- a/gn/shared_sources.gni +++ b/gn/shared_sources.gni @@ -69,14 +69,27 @@ _pdf_gypi = exec_script("gypi_to_gn.py", [ "../gyp/pdf.gypi" ]) skia_pdf_sources = _pdf_gypi.sources -_sources_gypi = exec_script("gypi_to_gn.py", +# SKSL. +_sksl_gypi = exec_script("gypi_to_gn.py", [ - rebase_path("../gyp/skia_sources.gypi"), + rebase_path("../gyp/sksl.gypi"), + "--replace=<(skia_include_path)=$_path_to_include", + "--replace=<(skia_src_path)=$_path_to_src", ], "scope", - [ "../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") + [ "../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 # Skia Chromium defines. These flags will be defined in chromium If these # become 'permanent', they should be moved into Chrome's skia build file. |