2 files changed, 8 insertions, 3 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index ebd2fe4b56..d2c127c133 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1357,8 +1357,12 @@ int main(int argc, char** argv) {
     SkTaskGroup::Enabler enabled(FLAGS_threads);
     gCreateTypefaceDelegate = &create_from_name;
 
-    if (nullptr == GetResourceAsData("images/color_wheel.png")) {
-        info("Some resources are missing.  Do you need to set --resourcePath?\n");
+    {
+        SkString testResourcePath = GetResourcePath("images/color_wheel.png");
+        SkFILEStream testResource(testResourcePath.c_str());
+        if (!testResource.isValid()) {
+            info("Some resources are missing.  Do you need to set --resourcePath?\n");
+        }
     }
     gather_gold();
     gather_uninteresting_hashes();
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 96817e0749..89a4b531e2 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1066,7 +1066,8 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const {
     }
 
     // Load the dst ICC profile.  This particular dst is fairly similar to Adobe RGB.
-    sk_sp<SkData> dstData = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
+    sk_sp<SkData> dstData = SkData::MakeFromFileName(
+            GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str());
     if (!dstData) {
         return "Cannot read monitor profile.  Is the resource path set correctly?";
     }