diff options
| author |  mtklein <mtklein@google.com> | 2014-06-20 10:43:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-20 10:43:07 -0700 |
| commit | 9e64b78ff687edd24c55c0e26942411468032d32 (patch) | |
| tree | dac43280963ee6b72350e706649d750fbb0ea5c5 /platform_tools | |
| parent | a3530ef268acbbbd84cd4c5465cdc29df5269390 (diff) | |
Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)
Reason for revert:
GpuTimer broken
Original issue's description:
> Move BenchTimer to tools as Timer
>
> This breaks a bunch of circular dependencies between tools and gm and bench.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed
R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/346753003
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 7 | ||||
| -rw-r--r-- | platform_tools/android/gyp/skia_launcher.gypi | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 624b599bd6..9ebee7cc6d 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -45,6 +45,13 @@ ], }, { + 'target_name': 'skia_launcher', + 'type': 'executable', + 'sources': [ + '../launcher/skia_launcher.cpp', + ], + }, + { 'target_name': 'SampleApp_APK', 'type': 'none', 'dependencies': [ diff --git a/platform_tools/android/gyp/skia_launcher.gypi b/platform_tools/android/gyp/skia_launcher.gypi deleted file mode 100644 index f8b5dfd794..0000000000 --- a/platform_tools/android/gyp/skia_launcher.gypi +++ /dev/null @@ -1,7 +0,0 @@ -{ - 'targets': [{ - 'target_name': 'skia_launcher', - 'type': 'executable', - 'sources': [ '../launcher/skia_launcher.cpp' ], - }] -} |