aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-18 17:22:30 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-18 17:22:30 +0000
commit69feaca231990003a7f3dadd6bfb9110dc6b9b96 (patch)
treeda46a3b9ad021d4e2d511d54da69f715d45fe3d1 /bench
parent41d2532931a2e85b56ae112047d57927cb09ef6f (diff)
Fix Android bench bots for Xoom due to OOM errors.
BUG= 1422 BUG= 1430 R=borenet@google.com Review URL: https://codereview.chromium.org/19672007 git-svn-id: http://skia.googlecode.com/svn/trunk@10147 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
-rw-r--r--bench/DashBench.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index 5d320a2822..0fcde316b9 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -416,6 +416,10 @@ DEF_BENCH( return new DrawPointsDashingBench(p, 3, 1, true); )
DEF_BENCH( return new DrawPointsDashingBench(p, 5, 5, false); )
DEF_BENCH( return new DrawPointsDashingBench(p, 5, 5, true); )
+/* Disable the GiantDashBench for Android devices until we can better control
+ * the memory usage. (https://code.google.com/p/skia/issues/detail?id=1430)
+ */
+#ifndef SK_BUILD_FOR_ANDROID
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kHori_LineType, 0); )
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kVert_LineType, 0); )
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kDiag_LineType, 0); )
@@ -426,3 +430,4 @@ DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kDiag_LineType, 0); )
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kHori_LineType, 2); )
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kVert_LineType, 2); )
DEF_BENCH( return new GiantDashBench(p, GiantDashBench::kDiag_LineType, 2); )
+#endif