diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-11-27 18:02:34 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-11-27 18:02:34 +0000 |
| commit | 2a714bebb617f4e5d877aa8d9a4d7abc19f9b9b6 (patch) | |
| tree | 61c1e47245fd61ea65005f141da8244287ea3498 | |
| parent | 0315d5c2e6b224328f0a476fe5c41a85c57a3c14 (diff) | |
| parent | 388dcb5095bee6c5b0c92cbfac86bfcaeef0dd86 (diff) | |
| download | skia-2a714bebb617f4e5d877aa8d9a4d7abc19f9b9b6.tar.gz | |
[automerger] RESTRICT AUTOMERGE: Add SkAndroidFrameworkUtils::SafetyNetLog am: 16ed5c7516 am: 30ace5b21b am: 388dcb5095
Change-Id: I70cd077361f46374969152cf01e99f0a4482cdfb
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | include/android/SkAndroidFrameworkUtils.h | 25 | ||||
| -rw-r--r-- | src/android/SkAndroidFrameworkUtils.cpp | 19 |
3 files changed, 45 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 4dbd17bb63..a501e2cb50 100644 --- a/Android.mk +++ b/Android.mk @@ -89,6 +89,7 @@ LOCAL_SRC_FILES := \ src/codec/SkWebpCodec.cpp \ src/codec/SkCodecImageGenerator.cpp \ src/ports/SkImageGenerator_skia.cpp \ + src/android/SkAndroidFrameworkUtils.cpp \ src/android/SkBitmapRegionCanvas.cpp \ src/android/SkBitmapRegionCodec.cpp \ src/android/SkBitmapRegionDecoder.cpp \ diff --git a/include/android/SkAndroidFrameworkUtils.h b/include/android/SkAndroidFrameworkUtils.h new file mode 100644 index 0000000000..abe959983b --- /dev/null +++ b/include/android/SkAndroidFrameworkUtils.h @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkAndroidFrameworkUtils_DEFINED +#define SkAndroidFrameworkUtils_DEFINED + +#include "SkTypes.h" + +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + +/** + * SkAndroidFrameworkUtils expose private APIs used only by Android framework. + */ +class SkAndroidFrameworkUtils { +public: + static void SafetyNetLog(const char*); +}; + +#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK + +#endif // SkAndroidFrameworkUtils_DEFINED diff --git a/src/android/SkAndroidFrameworkUtils.cpp b/src/android/SkAndroidFrameworkUtils.cpp new file mode 100644 index 0000000000..968b7b7d08 --- /dev/null +++ b/src/android/SkAndroidFrameworkUtils.cpp @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "SkAndroidFrameworkUtils.h" + +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + +#include <log/log.h> + +void SkAndroidFrameworkUtils::SafetyNetLog(const char* bugNumber) { + android_errorWriteLog(0x534e4554, bugNumber); +} + +#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK + |