diff options
| author | Leon Scroggins III <scroggo@google.com> | 2018-11-08 09:40:09 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2018-11-26 19:56:15 +0000 |
| commit | 2277702eee7eb6e99002b6b5248254fe9ffd5f76 (patch) | |
| tree | 24da255040e6e9ef76c5d1b3aa2c2f71d3de80d9 | |
| parent | 5708fdf4cacf3205e6f7b1f55de353772594e5f8 (diff) | |
| download | skia-2277702eee7eb6e99002b6b5248254fe9ffd5f76.tar.gz | |
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
| -rw-r--r-- | include/android/SkAndroidFrameworkUtils.h | 6 | ||||
| -rw-r--r-- | src/android/SkAndroidFrameworkUtils.cpp | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/android/SkAndroidFrameworkUtils.h b/include/android/SkAndroidFrameworkUtils.h index 0457d03534..46d251626e 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 @@ public: */ 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 diff --git a/src/android/SkAndroidFrameworkUtils.cpp b/src/android/SkAndroidFrameworkUtils.cpp index 5fbc2cae18..f0a7b8a2fc 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 @@ bool SkAndroidFrameworkUtils::clipWithStencil(SkCanvas* canvas) { } #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 |