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

Side by Side Diff: gyp/tests.gyp

Issue 318493002: Android: remove -lcutils dependency (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 6 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/gm.gyp ('k') | platform_tools/android/bin/android_gdbserver » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP file to build unit tests. 1 # GYP file to build unit tests.
2 { 2 {
3 'includes': [ 3 'includes': [
4 'apptype_console.gypi', 4 'apptype_console.gypi',
5 ], 5 ],
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'tests', 8 'target_name': 'tests',
9 'type': 'executable', 9 'type': 'executable',
10 'includes': [ 10 'includes': [
11 'pathops_unittest.gypi', 11 'pathops_unittest.gypi',
12 'tests.gypi', 12 'tests.gypi',
13 ], 13 ],
14 'sources': [ 14 'sources': [
15 '../tests/skia_test.cpp', 15 '../tests/skia_test.cpp',
16 ], 16 ],
17 'conditions': [ 17 'conditions': [
18 [ 'skia_android_framework == 1', { 18 [ 'skia_android_framework == 1', {
19 'libraries': [ 19 'libraries': [
20 '-lskia', 20 '-lskia',
21 '-lcutils',
22 ], 21 ],
23 'libraries!': [ 22 'libraries!': [
24 '-lz', 23 '-lz',
25 '-llog', 24 '-llog',
26 ], 25 ],
27 }], 26 }],
28 [ 'skia_gpu == 1', { 27 [ 'skia_gpu == 1', {
29 'include_dirs': [ 28 'include_dirs': [
30 '../src/gpu', 29 '../src/gpu',
31 ], 30 ],
32 }], 31 }],
33 ], 32 ],
34 }, 33 },
35 ], 34 ],
36 } 35 }
OLDNEW
« no previous file with comments | « gyp/gm.gyp ('k') | platform_tools/android/bin/android_gdbserver » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698