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>

13 files changed, 13 insertions, 104 deletions

diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp
index 03ef93e581..98845e56ce 100644
--- a/tools/dump_record.cpp
+++ b/tools/dump_record.cpp
@@ -37,8 +37,7 @@ static void dump(const char* name, int w, int h, const SkRecord& record) {
     DumpRecord(record, &canvas, FLAGS_timeWithCommand);
 }
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
 
     for (int i = 0; i < FLAGS_skps.count(); i++) {
@@ -95,9 +94,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/gpuveto.cpp b/tools/gpuveto.cpp
index 4672a38b6b..cc33721770 100644
--- a/tools/gpuveto.cpp
+++ b/tools/gpuveto.cpp
@@ -21,8 +21,7 @@ DEFINE_bool2(quiet, q, false, "quiet");
 static const int kSuccess = 0;
 static const int kError = 1;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
 #if SK_SUPPORT_GPU
     SkCommandLineFlags::SetUsage("Reports on an skp file's suitability for GPU rasterization");
     SkCommandLineFlags::Parse(argc, argv);
@@ -70,9 +69,3 @@ int tool_main(int argc, char** argv) {
     return kError;
 #endif
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif
diff --git a/tools/imgblur.cpp b/tools/imgblur.cpp
index 23ba815db3..20d36842f0 100644
--- a/tools/imgblur.cpp
+++ b/tools/imgblur.cpp
@@ -25,8 +25,7 @@ DEFINE_double(sigma, 1, "Sigma to be used for blur (> 0.0f)");
 static const int kSuccess = 0;
 static const int kError = 1;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("Brute force blur of an image.");
     SkCommandLineFlags::Parse(argc, argv);
 
@@ -72,9 +71,3 @@ int tool_main(int argc, char** argv) {
 
     return kSuccess;
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif
diff --git a/tools/imgslice.cpp b/tools/imgslice.cpp
index 2fdc819aa9..51aeef7830 100644
--- a/tools/imgslice.cpp
+++ b/tools/imgslice.cpp
@@ -32,8 +32,7 @@ DEFINE_bool2(reverse, v, false, "Iterate from max to min");
 static const int kSuccess = 0;
 static const int kError = 1;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("Print out a row or column of an image.");
     SkCommandLineFlags::Parse(argc, argv);
 
@@ -135,9 +134,3 @@ int tool_main(int argc, char** argv) {
 
     return kSuccess;
 }
-
-#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_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
diff --git a/tools/pinspect.cpp b/tools/pinspect.cpp
index 4dfabcdca4..29a422257d 100644
--- a/tools/pinspect.cpp
+++ b/tools/pinspect.cpp
@@ -54,8 +54,7 @@ static void dumpOps(SkPicture* pic) {
 #endif
 }
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkAutoGraphics ag;
     if (argc < 2) {
         printf("Usage: pinspect [--dump-ops] filename [filename ...]\n");
@@ -81,9 +80,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/skdiff/skdiff_image.cpp b/tools/skdiff/skdiff_image.cpp
index 287523de15..cb446d424f 100644
--- a/tools/skdiff/skdiff_image.cpp
+++ b/tools/skdiff/skdiff_image.cpp
@@ -111,8 +111,7 @@ static void usage (char * argv0) {
 const int kNoError = 0;
 const int kGenericError = -1;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     DiffMetricProc diffProc = compute_diff_pmcolor;
 
     // Maximum error tolerated in any one color channel in any one pixel before
@@ -366,9 +365,3 @@ int tool_main(int argc, char** argv) {
 
     return num_failing_results;
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif
diff --git a/tools/skdiff/skdiff_main.cpp b/tools/skdiff/skdiff_main.cpp
index f03ccb04b0..59e9b0a6b7 100644
--- a/tools/skdiff/skdiff_main.cpp
+++ b/tools/skdiff/skdiff_main.cpp
@@ -610,8 +610,7 @@ static void usage (char * argv0) {
 const int kNoError = 0;
 const int kGenericError = -1;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     DiffMetricProc diffProc = compute_diff_pmcolor;
     int (*sortProc)(const void*, const void*) = compare<CompareDiffMetrics>;
 
@@ -853,9 +852,3 @@ int tool_main(int argc, char** argv) {
     // make sure that we only return 0 when there were no failures.
     return (num_failing_results > 255) ? 255 : num_failing_results;
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif
diff --git a/tools/skhello.cpp b/tools/skhello.cpp
index 0411b398b8..2ab8069eee 100644
--- a/tools/skhello.cpp
+++ b/tools/skhello.cpp
@@ -54,8 +54,7 @@ static bool do_document(int w, int h, const char path[], const char text[],
     return false;
 }
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("");
     SkCommandLineFlags::Parse(argc, argv);
 
@@ -99,9 +98,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/skpinfo.cpp b/tools/skpinfo.cpp
index be2aa22d5f..104322f08f 100644
--- a/tools/skpinfo.cpp
+++ b/tools/skpinfo.cpp
@@ -29,8 +29,7 @@ static const int kInvalidTag = 3;
 static const int kMissingInput = 4;
 static const int kIOError = 5;
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("Prints information about an skp file");
     SkCommandLineFlags::Parse(argc, argv);
 
@@ -176,9 +175,3 @@ int tool_main(int argc, char** argv) {
 
     return kSuccess;
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif
diff --git a/tools/skpmaker.cpp b/tools/skpmaker.cpp
index e7418ad453..a3ccd612f8 100644
--- a/tools/skpmaker.cpp
+++ b/tools/skpmaker.cpp
@@ -45,8 +45,7 @@ static void make_skp(SkScalar width, SkScalar height, SkScalar border, SkColor c
     recorder.finishRecordingAsPicture()->serialize(&stream);
 }
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("Creates a simple .skp file for testing.");
     SkCommandLineFlags::Parse(argc, argv);
 
@@ -83,9 +82,3 @@ int tool_main(int argc, char** argv) {
              color, FLAGS_writePath[0]);
     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/whitelist_typefaces.cpp b/tools/whitelist_typefaces.cpp
index b446a3ac49..5cdfb6abe2 100644
--- a/tools/whitelist_typefaces.cpp
+++ b/tools/whitelist_typefaces.cpp
@@ -10,8 +10,7 @@
 extern bool CheckChecksums();
 extern bool GenerateChecksums();
 
-int tool_main(int argc, char** argv);
-int tool_main(int argc, char** argv) {
+int main(int argc, char** argv) {
     if (argc == 2) {
         SkAutoGraphics ag;  // Enable use of SkRTConfig
         if (!strcmp(argv[1], "--check")) {
@@ -27,9 +26,3 @@ int tool_main(int argc, char** argv) {
     SkDebugf("Usage:\n %s [--check] [--generate]\n\n", argv[0]);
     return 3;
 }
-
-#if !defined SK_BUILD_FOR_IOS
-int main(int argc, char * const argv[]) {
-    return tool_main(argc, (char**) argv);
-}
-#endif