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 /tools/lua | |
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 'tools/lua')
-rw-r--r-- | tools/lua/lua_app.cpp | 9 | ||||
-rw-r--r-- | tools/lua/lua_pictures.cpp | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tools/lua/lua_app.cpp b/tools/lua/lua_app.cpp index 92623d0a20..68e1a8ddbd 100644 --- a/tools/lua/lua_app.cpp +++ b/tools/lua/lua_app.cpp @@ -27,8 +27,7 @@ static sk_sp<SkData> read_into_data(const char file[]) { return data; } -int tool_main(int argc, char** argv); -int tool_main(int argc, char** argv) { +int main(int argc, char** argv) { SkAutoGraphics ag; SkLua L; @@ -53,9 +52,3 @@ int tool_main(int argc, char** argv) { } return 0; } - -#if !defined SK_BUILD_FOR_IOS -int main(int argc, char * const argv[]) { - return tool_main(argc, (char**) argv); -} -#endif diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp index fd44901086..85fbd98f60 100644 --- a/tools/lua/lua_pictures.cpp +++ b/tools/lua/lua_pictures.cpp @@ -63,8 +63,7 @@ static void call_canvas(lua_State* L, SkLuaCanvas* canvas, } } -int tool_main(int argc, char** argv); -int tool_main(int argc, char** argv) { +int main(int argc, char** argv) { SkCommandLineFlags::SetUsage("apply lua script to .skp files."); SkCommandLineFlags::Parse(argc, argv); @@ -161,9 +160,3 @@ int tool_main(int argc, char** argv) { } return 0; } - -#if !defined SK_BUILD_FOR_IOS -int main(int argc, char * const argv[]) { - return tool_main(argc, (char**) argv); -} -#endif |