1 files changed, 6 insertions, 8 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp
index 0e343c4883..183a8d807d 100644
--- a/tools/Resources.cpp
+++ b/tools/Resources.cpp
@@ -43,17 +43,15 @@ std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource) {
 }
 
 sk_sp<SkData> GetResourceAsData(const char* resource) {
-    if (gResourceFactory) {
-        if (auto data = gResourceFactory(resource)) {
-            return data;
-        }
-        SkDebugf("Resource \"%s\" not found.\n", resource);
-        SK_ABORT("missing resource");
-    }
-    if (auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str())) {
+    if (sk_sp<SkData> data = gResourceFactory
+                           ? gResourceFactory(resource)
+                           : SkData::MakeFromFileName(GetResourcePath(resource).c_str())) {
         return data;
     }
     SkDebugf("Resource \"%s\" not found.\n", resource);
+    #ifdef SK_TOOLS_REQUIRE_RESOURCES
+    SK_ABORT("missing resource");
+    #endif
     return nullptr;
 }