From be28ee2974474800323ce4fabf62a839018be591 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 6 Feb 2017 12:46:20 -0500 Subject: 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 Reviewed-by: Stephan Altmueller --- tools/lua/lua_app.cpp | 9 +-------- tools/lua/lua_pictures.cpp | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'tools/lua') 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 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 -- cgit v1.2.3