aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-02-06 12:46:20 -0500
committerGravatar Mike Klein <mtklein@chromium.org>2017-02-06 18:02:41 +0000
commitbe28ee2974474800323ce4fabf62a839018be591 (patch)
tree0af11271212a0d04bba7e63e84d78860410f31d5 /bench
parent160907f8defef112c358cdd5cb9e5e093ca93b09 (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 'bench')
-rw-r--r--bench/nanobench.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 4e1da2bd98..0f1e4825e2 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -1095,8 +1095,8 @@ static void start_keepalive() {
intentionallyLeaked->start();
}
-int nanobench_main();
-int nanobench_main() {
+int main(int argc, char** argv) {
+ SkCommandLineFlags::Parse(argc, argv);
#if defined(SK_BUILD_FOR_IOS)
cd_Documents();
#endif
@@ -1364,10 +1364,3 @@ int nanobench_main() {
return 0;
}
-
-#if !defined(SK_BUILD_FOR_IOS) || defined(NANOBENCH_DEFINE_MAIN)
-int main(int argc, char** argv) {
- SkCommandLineFlags::Parse(argc, argv);
- return nanobench_main();
-}
-#endif