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

Side by Side Diff: gyp/tools.gyp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « gyp/ports.gyp ('k') | gyp/utils.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP file to build various tools. 5 # GYP file to build various tools.
6 # 6 #
7 # To build on Linux: 7 # To build on Linux:
8 # ./gyp_skia tools.gyp && make tools 8 # ./gyp_skia tools.gyp && make tools
9 # 9 #
10 { 10 {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 '../tools/skdiff_utils.h', 235 '../tools/skdiff_utils.h',
236 ], 236 ],
237 'dependencies': [ 237 'dependencies': [
238 'skia_lib.gyp:skia_lib', 238 'skia_lib.gyp:skia_lib',
239 ], 239 ],
240 }, 240 },
241 { 241 {
242 'target_name': 'skhello', 242 'target_name': 'skhello',
243 'type': 'executable', 243 'type': 'executable',
244 'dependencies': [ 244 'dependencies': [
245 'flags.gyp:flags',
246 'pdf.gyp:pdf',
245 'skia_lib.gyp:skia_lib', 247 'skia_lib.gyp:skia_lib',
246 ], 248 ],
247 'conditions': [ 249 'sources': [
248 [ 'skia_os == "nacl"', { 250 '../tools/skhello.cpp',
249 'sources': [
250 '../platform_tools/nacl/src/nacl_hello.cpp',
251 ],
252 }, {
253 'sources': [
254 '../tools/skhello.cpp',
255 ],
256 'dependencies': [
257 'flags.gyp:flags',
258 'pdf.gyp:pdf',
259 ],
260 }],
261 ], 251 ],
262 }, 252 },
263 { 253 {
264 'target_name': 'skpinfo', 254 'target_name': 'skpinfo',
265 'type': 'executable', 255 'type': 'executable',
266 'sources': [ 256 'sources': [
267 '../tools/skpinfo.cpp', 257 '../tools/skpinfo.cpp',
268 ], 258 ],
269 'include_dirs': [ 259 'include_dirs': [
270 '../src/core/', 260 '../src/core/',
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 '<(skia_include_path)/ports/SkTypeface_win.h', 636 '<(skia_include_path)/ports/SkTypeface_win.h',
647 '<(skia_include_path)/utils/ios', 637 '<(skia_include_path)/utils/ios',
648 '<(skia_include_path)/utils/mac', 638 '<(skia_include_path)/utils/mac',
649 '<(skia_include_path)/utils/win', 639 '<(skia_include_path)/utils/win',
650 '<(skia_include_path)/utils/SkDebugUtils.h', 640 '<(skia_include_path)/utils/SkDebugUtils.h',
651 '<(skia_include_path)/utils/SkJSONCPP.h', 641 '<(skia_include_path)/utils/SkJSONCPP.h',
652 '<(skia_include_path)/views/animated', 642 '<(skia_include_path)/views/animated',
653 '<(skia_include_path)/views/SkOSWindow_Android.h', 643 '<(skia_include_path)/views/SkOSWindow_Android.h',
654 '<(skia_include_path)/views/SkOSWindow_iOS.h', 644 '<(skia_include_path)/views/SkOSWindow_iOS.h',
655 '<(skia_include_path)/views/SkOSWindow_Mac.h', 645 '<(skia_include_path)/views/SkOSWindow_Mac.h',
656 '<(skia_include_path)/views/SkOSWindow_NaCl.h',
657 '<(skia_include_path)/views/SkOSWindow_SDL.h', 646 '<(skia_include_path)/views/SkOSWindow_SDL.h',
658 '<(skia_include_path)/views/SkOSWindow_Unix.h', 647 '<(skia_include_path)/views/SkOSWindow_Unix.h',
659 '<(skia_include_path)/views/SkOSWindow_Win.h', 648 '<(skia_include_path)/views/SkOSWindow_Win.h',
660 '<(skia_include_path)/views/SkWindow.h', 649 '<(skia_include_path)/views/SkWindow.h',
661 ], 650 ],
662 }, 651 },
663 'include_dirs': [ 652 'include_dirs': [
664 '<@(includes_to_test)', 653 '<@(includes_to_test)',
665 ], 654 ],
666 'sources': [ 655 'sources': [
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 'flags.gyp:flags', 759 'flags.gyp:flags',
771 'skia_lib.gyp:skia_lib', 760 'skia_lib.gyp:skia_lib',
772 'resources', 761 'resources',
773 ], 762 ],
774 }, 763 },
775 ], 764 ],
776 }, 765 },
777 ], 766 ],
778 ], 767 ],
779 } 768 }
OLDNEW
« no previous file with comments | « gyp/ports.gyp ('k') | gyp/utils.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698