commit 8bf1f9ffcf4b0168a1a05399eb0ed4e5e04eab80
author Robert Phillips <robertphillips@google.com> Wed May 31 15:01:20 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 31 23:12:39 2017 +0000
tree 0bd70f825ee62563944dad12acdfe464c9818b89
parent 3f3075819f242158dcfc1690df5c15ba39c5dbb3

Disable deferred proxies for M60 branch

Bug: 720325
Change-Id: I0529bbcd592bdc5d5a741731af8a66971e485649
Reviewed-on: https://skia-review.googlesource.com/18239
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/ProxyTest.cpp

diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 1799a75..40cbeeb 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -10,6 +10,9 @@
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
+
+#ifndef SK_DISABLE_DEFERRED_PROXIES
+
 #include "GrBackendSurface.h"
 #include "GrRenderTargetPriv.h"
 #include "GrRenderTargetProxy.h"
@@ -307,3 +310,5 @@
 }
 
 #endif
+
+#endif