diff options
| author |  jcgregorio <jcgregorio@google.com> | 2014-11-13 08:06:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-13 08:06:40 -0800 |
| commit | 3b27adef0a52f6d321fdee7412ef69e7a7284bcc (patch) | |
| tree | 44edab4ef6bc06603d150d35575cbef69833c82e /gyp | |
| parent | 1c6e7571d40e31247609fd7469f8422018304310 (diff) | |
Revert of Make nanobench and dm be usable from Chromium build (patchset #5 id:80001 of https://codereview.chromium.org/657373002/)
Reason for revert:
Causing breakages on Mac build.
Original issue's description:
> Make nanobench and dm be usable from Chromium build
>
> Move the app logic for each app as follows:
>
> <app>.cpp -- the file which contains main(). Embedders that compile
> their own apps, such as ios shell, upcoming Chromium dm etc, do not use this.
>
> <app>_main.cpp -- the main logic of the Skia test application. This will be
> used by Skia -compiled apps as well as embedder -compiled apps.
>
> <app>_main.h -- the API for the main logic. This will be
> used by Skia -compiled apps as well as embedder -compiled apps.
>
> This way (the upcoming) Chromium dm can setup its Chromium-specific setup
> in custom main(), and then call dm_main(), without the need of any
> SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not.
>
> BUG=skia:2992
>
> Committed: https://skia.googlesource.com/skia/+/c092d3bdab5f723576cc0346cea3ee282a9cb444
TBR=mtklein@chromium.org,mtklein@google.com,borenet@google.com,kkinnunen@nvidia.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992
Review URL: https://codereview.chromium.org/724073002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gyp | 1 | ||||
| -rw-r--r-- | gyp/dm.gyp | 3 | ||||
| -rw-r--r-- | gyp/most.gyp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index e91c4f29f5..26849d511a 100644 --- a/gyp/bench.gyp +++ b/gyp/bench.gyp @@ -13,7 +13,6 @@ '../bench/GMBench.cpp', '../bench/RecordingBench.cpp', '../bench/SKPBench.cpp', - '../bench/nanobench_main.cpp', '../bench/nanobench.cpp', ], 'includes': [ diff --git a/gyp/dm.gyp b/gyp/dm.gyp index 0e5eebd416..e4d6bd6708 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -8,9 +8,6 @@ 'includes': [ 'dm.gypi', ], - 'sources': [ - '../dm/dm_main.cpp', - ], 'conditions': [ ['skia_android_framework', { 'libraries': [ '-lskia' ], diff --git a/gyp/most.gyp b/gyp/most.gyp index 61efe1e455..e22629ae74 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -29,7 +29,7 @@ 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ['skia_os == "ios"', { - 'dependencies!': [ 'SampleApp.gyp:SampleApp', 'dm.gyp:dm', 'bench.gyp:*' ], + 'dependencies!': [ 'SampleApp.gyp:SampleApp' ], 'dependencies': ['iOSShell.gyp:iOSShell' ], }], ['skia_os == "mac" or skia_os == "linux"', { |