diff options
| author |  mtklein <mtklein@chromium.org> | 2015-08-14 10:03:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-14 10:03:45 -0700 |
| commit | 9a106ba2dd68ced8f6556e99ba211a37439a03bb (patch) | |
| tree | 80fd84377cd4905293ef1bee24a88d1a6f2be3fb /gyp | |
| parent | 090ae8e4547b6142e5b7dbcf441aed0d517fa960 (diff) | |
A bit of misc cleanup.
- Update comments about skia_shared_lib
- Remove dead code (system_preferences)
- Remove non-building code (techtalk1)
- Turn gm/annotated_text back on.
BUG=skia:
Review URL: https://codereview.chromium.org/1286133004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 4 | ||||
| -rw-r--r-- | gyp/gmslides.gypi | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 2a927d1a54..83b634c95f 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -322,7 +322,7 @@ '-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=1', - # We can't use the skia_shared_library gyp setting because we need to + # We can't use the skia_shared_lib gyp setting because we need to # isolate this define to Skia sources. CFLAGS are local to Android.mk # and ensures that this define is not exported to clients of the library '-DSKIA_IMPLEMENTATION=1', @@ -369,7 +369,7 @@ 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 'SK_IGNORE_ETC1_SUPPORT', - # We can't use the skia_shared_library gyp setting because we need expose + # We can't use the skia_shared_lib gyp setting because we need expose # this define globally and the the implemention define as a cflag. 'SKIA_DLL', 'SK_PRINT_CODEC_MESSAGES', diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 731c1ed83f..87910e5698 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -28,11 +28,6 @@ '../src/utils/debugger/SkObjectParser.h', '../src/utils/debugger/SkObjectParser.cpp', ], - 'sources!': [ - '../gm/annotated_text.cpp', - '../gm/system_preferences_default.cpp', - '../gm/techtalk1.cpp', - ], }], ], } |