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 /gyp/utils.gyp | |
| 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 'gyp/utils.gyp')
| -rw-r--r-- | gyp/utils.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 12e7836db3..b6ce7fde1b 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -4,9 +4,6 @@ # found in the LICENSE file. # Gyp for utils. { - 'variables': { - 'includes': [ 'skia_sources.gypi' ], - }, 'targets': [ { 'target_name': 'utils', @@ -17,6 +14,9 @@ 'core.gyp:*', 'etc1.gyp:libetc1', ], + 'includes': [ + 'utils.gypi', + ], 'include_dirs': [ '../include/effects', '../include/gpu', @@ -33,7 +33,7 @@ '../src/utils/win', ], 'sources': [ - '<@(utils_sources)', # Makes the sources appear in IDEs (but does not modify the build). + 'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build). ], 'conditions': [ [ 'skia_os == "mac"', { |