commit 15c377e6230b060d54c43247a0a261ff7c73553b
author Leon Scroggins III <scroggo@google.com> Thu Nov 08 09:40:09 2018 -0500
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 05 05:13:34 2018 +0000
tree 24da255040e6e9ef76c5d1b3aa2c2f71d3de80d9
parent c5bd09cfa93a7e92d736eedbb585af85ad4ecbe8

RESTRICT AUTOMERGE: Add SkAndroidFrameworkUtils::SafetyNetLog

Cherry-picked from upstream (minus SkPngCodec-specific
code):
https://skia-review.googlesource.com/c/skia/+/170354

Bug: 117838472
Bug: 118372692
Bug: 118143775
Test: Iae4d7f393c892111b12282c5eae31d79912721f9
Change-Id: I463f8b2c11c07098e9ec24448f66fcafcf6cd76b
(cherry picked from commit 2277702eee7eb6e99002b6b5248254fe9ffd5f76)

include/android/SkAndroidFrameworkUtils.h

diff --git a/include/android/SkAndroidFrameworkUtils.h b/include/android/SkAndroidFrameworkUtils.h
index 0457d03..46d2516 100644
--- a/include/android/SkAndroidFrameworkUtils.h
+++ b/include/android/SkAndroidFrameworkUtils.h
@@ -10,7 +10,7 @@
 
 #include "SkTypes.h"
 
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 class SkCanvas;
 
@@ -31,8 +31,10 @@
      */
     static bool clipWithStencil(SkCanvas* canvas);
 #endif //SK_SUPPORT_GPU
+
+    static void SafetyNetLog(const char*);
 };
 
-#endif // SK_BUILD_FOR_ANDROID
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 #endif // SkAndroidFrameworkUtils_DEFINED

src/android/SkAndroidFrameworkUtils.cpp

diff --git a/src/android/SkAndroidFrameworkUtils.cpp b/src/android/SkAndroidFrameworkUtils.cpp
index 5fbc2ca..f0a7b8a 100644
--- a/src/android/SkAndroidFrameworkUtils.cpp
+++ b/src/android/SkAndroidFrameworkUtils.cpp
@@ -17,7 +17,9 @@
 #include "effects/GrDisableColorXP.h"
 #endif //SK_SUPPORT_GPU
 
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+
+#include <log/log.h>
 
 #if SK_SUPPORT_GPU
 bool SkAndroidFrameworkUtils::clipWithStencil(SkCanvas* canvas) {
@@ -52,5 +54,9 @@
 }
 #endif //SK_SUPPORT_GPU
 
-#endif // SK_BUILD_FOR_ANDROID
+void SkAndroidFrameworkUtils::SafetyNetLog(const char* bugNumber) {
+    android_errorWriteLog(0x534e4554, bugNumber);
+}
+
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK