build iOS with 'make all'
This builds all skia tests by treating iOS tools
as executable applications. A few warnings were
fixed as well.
Removed old trace draw code and remnants.
Review URL: https://codereview.appspot.com/6597063
git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 5c80a01..f884a64 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -106,7 +106,8 @@
bool fAndroidMode;
};
-int main (int argc, char * const argv[]) {
+int tool_main(int argc, char** argv);
+int tool_main(int argc, char** argv) {
#ifdef SK_ENABLE_INST_COUNT
gPrintInstCount = true;
#endif
@@ -188,3 +189,10 @@
return (failCount == 0) ? 0 : 1;
}
+
+#if !defined SK_BUILD_FOR_IOS
+int main(int argc, char * const argv[]) {
+ return tool_main(argc, (char**) argv);
+}
+#endif
+