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

Side by Side Diff: gyp/tools.gyp

Issue 1536013003: Move SkAndroidSDKCanvas to tools and ensure that it is built on all Android builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years 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/dm.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 24 matching lines...) Expand all
35 'whitelist_typefaces', 35 'whitelist_typefaces',
36 ], 36 ],
37 'conditions': [ 37 'conditions': [
38 ['skia_shared_lib', 38 ['skia_shared_lib',
39 { 39 {
40 'dependencies': [ 40 'dependencies': [
41 'sklua', # This can only be built if skia is built as a shared lib rary 41 'sklua', # This can only be built if skia is built as a shared lib rary
42 ], 42 ],
43 }, 43 },
44 ], 44 ],
45 [ 'skia_os == "android"',
46 {
47 'dependencies': [
48 # Build this by default to catch compile errors more quickly, sin ce
49 # the only other time this code is exercised in the android frame work
50 'android_utils',
51 ],
52 },
53 ],
45 ], 54 ],
46 }, 55 },
47 { 56 {
57 'target_name': 'android_utils',
58 'type': 'static_library',
59 'dependencies': [
60 'core.gyp:core',
61 ],
62 'sources': [
63 '../tools/android/SkAndroidSDKCanvas.h',
64 '../tools/android/SkAndroidSDKCanvas.cpp',
65 ],
66 'direct_dependent_settings': {
67 'include_dirs': [
68 '../tools/android',
69 ],
70 },
71 },
72 {
48 'target_name': 'dump_record', 73 'target_name': 'dump_record',
49 'type': 'executable', 74 'type': 'executable',
50 'sources': [ 75 'sources': [
51 '../tools/dump_record.cpp', 76 '../tools/dump_record.cpp',
52 '../tools/DumpRecord.cpp', 77 '../tools/DumpRecord.cpp',
53 ], 78 ],
54 'include_dirs': [ 79 'include_dirs': [
55 '../include/private', 80 '../include/private',
56 '../src/core', 81 '../src/core',
57 ], 82 ],
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 'flags.gyp:flags', 570 'flags.gyp:flags',
546 'skia_lib.gyp:skia_lib', 571 'skia_lib.gyp:skia_lib',
547 'resources', 572 'resources',
548 ], 573 ],
549 }, 574 },
550 ], 575 ],
551 }, 576 },
552 ], 577 ],
553 ], 578 ],
554 } 579 }
OLDNEW
« no previous file with comments | « gyp/dm.gyp ('k') | gyp/utils.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698