diff options
author | 2016-03-30 09:26:24 -0700 | |
---|---|---|
committer | 2016-03-30 09:26:24 -0700 | |
commit | 6f70d43719d0583d486a000f66e915c10a6b83a2 (patch) | |
tree | 6f9511faa88ca6d44932e1a247fc10c0f297a3e0 /gyp/gputest.gyp | |
parent | fe3456cb006110d045b26ff3f8681b893a757b58 (diff) |
Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (patchset #13 id:240001 of https://codereview.chromium.org/1815823002/ )
Reason for revert:
red bots
Original issue's description:
> Move SkGLContext and some GrGLInterface implementations to skgputest module
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
TBR=jvanverth@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1845473004
Diffstat (limited to 'gyp/gputest.gyp')
-rw-r--r-- | gyp/gputest.gyp | 79 |
1 files changed, 11 insertions, 68 deletions
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp index af812a1986..36db43403f 100644 --- a/gyp/gputest.gyp +++ b/gyp/gputest.gyp @@ -9,85 +9,28 @@ 'product_name': 'skia_skgputest', 'type': 'static_library', 'standalone_static_library': 1, + 'dependencies': [ + 'skia_lib.gyp:skia_lib', + ], 'include_dirs': [ - '../include/core', - '../include/config', '../include/gpu', '../include/private', '../include/utils', '../src/core', '../src/gpu', - '../src/utils', - '../tools/gpu', + '../../src/gpu', ], - 'all_dependent_settings': { + 'direct_dependent_settings': { 'include_dirs': [ - '../tools/gpu', + '../src/gpu', + '../../src/gpu', ], }, - 'dependencies': [ - 'gpu.gyp:skgpu', - ], 'sources': [ - '<!@(python find.py ../tools/gpu "*")' - ], - 'conditions': [ - [ 'skia_mesa and skia_os == "linux"', { - 'link_settings': { - 'libraries': [ - '-lOSMesa', - ], - }, - }], - [ 'skia_mesa and skia_os == "mac"', { - 'link_settings': { - 'libraries': [ - '/opt/X11/lib/libOSMesa.dylib', - ], - }, - 'include_dirs': [ - '/opt/X11/include/', - ], - }], - [ 'skia_angle', { - 'dependencies': [ - 'angle.gyp:*', - ], - 'export_dependent_settings': [ - 'angle.gyp:*', - ], - }], - ['skia_os != "win"', { - 'sources/': [ ['exclude', '_win\.(h|cpp)$'],], - }], - ['skia_os != "mac"', { - 'sources/': [ ['exclude', '_mac\.(h|cpp|m|mm)$'],], - }], - ['skia_os != "linux" and skia_os != "chromeos"', { - 'sources/': [ ['exclude', '_glx\.(h|cpp)$'],], - }], - ['skia_os != "ios"', { - 'sources/': [ ['exclude', '_iOS\.(h|cpp|m|mm)$'],], - }], - ['skia_os != "android"', { - 'sources/': [ ['exclude', '_android\.(h|cpp)$'],], - }], - ['skia_egl == 0', { - 'sources/': [ ['exclude', '_egl\.(h|cpp)$'],], - }], - [ 'skia_mesa == 0', { - 'sources/': [ - ['exclude', '_mesa\.(h|cpp)$'], - ], - }], - [ 'skia_angle == 0', { - 'sources/': [ - ['exclude', '_angle\.(h|cpp)$'], - ], - }], - [ 'skia_command_buffer == 0', { - 'sources/': [ ['exclude', '_command_buffer\.(h|cpp)$'], ], - }], + '<(skia_src_path)/gpu/GrContextFactory.cpp', + '<(skia_src_path)/gpu/GrContextFactory.h', + '<(skia_src_path)/gpu/GrTest.cpp', + '<(skia_src_path)/gpu/GrTest.h', ], }, ], |