diff options
author | Mike Klein <mtklein@chromium.org> | 2017-02-06 12:46:20 -0500 |
---|---|---|
committer | Mike Klein <mtklein@chromium.org> | 2017-02-06 18:02:41 +0000 |
commit | be28ee2974474800323ce4fabf62a839018be591 (patch) | |
tree | 0af11271212a0d04bba7e63e84d78860410f31d5 /dm | |
parent | 160907f8defef112c358cdd5cb9e5e093ca93b09 (diff) |
Make iOS main() functions normal.
The weird foo_mains are no longer needed when we build with GN.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm-Debug-iOS
Change-Id: Iae50696741e0dc277d96dda4968a1ae41cb17c8a
Reviewed-on: https://skia-review.googlesource.com/8064
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DM.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -1283,8 +1283,8 @@ static sk_sp<SkTypeface> create_from_name(const char familyName[], SkFontStyle s extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle ); -int dm_main(); -int dm_main() { +int main(int argc, char** argv) { + SkCommandLineFlags::Parse(argc, argv); #if defined(SK_BUILD_FOR_IOS) cd_Documents(); #endif @@ -1476,10 +1476,3 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex #endif } } // namespace skiatest - -#if !defined(SK_BUILD_FOR_IOS) || defined(DM_DEFINE_MAIN) -int main(int argc, char** argv) { - SkCommandLineFlags::Parse(argc, argv); - return dm_main(); -} -#endif |