Remove code guarded by SK_SURFACE_COPY_ON_WRITE_CRASHES

The SK_SURFACE_COPY_ON_WRITE_CRASHES flag is no longer defined and the
code it guarded may now be removed.

Change-Id: I35a1522a290be4338206dc067fd3f627c60e4c58

2 files changed, 0 insertions, 8 deletions

diff --git a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
index 8260ae213056..ec949b80ea55 100644
--- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
@@ -469,11 +469,7 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(RenderNodeDrawable, projectionHwLayer) {
         }
         SkCanvas* onNewCanvas() override { return new ProjectionTestCanvas(mDrawCounter); }
         sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override { return nullptr; }
-#ifdef SK_SURFACE_COPY_ON_WRITE_CRASHES
-        void onCopyOnWrite(ContentChangeMode) override {}
-#else
         bool onCopyOnWrite(ContentChangeMode) override { return true; }
-#endif
         int* mDrawCounter;
         void onWritePixels(const SkPixmap&, int x, int y) {}
     };
diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index fadb1de43376..60ae6044cd5b 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -221,11 +221,7 @@ public:
     sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override { return nullptr; }
     sk_sp<SkImage> onNewImageSnapshot(const SkIRect* bounds) override { return nullptr; }
     T* canvas() { return static_cast<T*>(getCanvas()); }
-#ifdef SK_SURFACE_COPY_ON_WRITE_CRASHES
-    void onCopyOnWrite(ContentChangeMode) override {}
-#else
     bool onCopyOnWrite(ContentChangeMode) override { return true; }
-#endif
     void onWritePixels(const SkPixmap&, int x, int y) override {}
 };
 }