diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-06 11:53:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-06 16:18:34 +0000 |
| commit | 981a31e6a8bd8d48ee2b56afd6424be8a21042c8 (patch) | |
| tree | fce1a28f5cf397e1a65ce5167ccf0106bd5304f9 /src/gpu/GrProcessor.cpp | |
| parent | 1265894423f394f7ca60e660168414cfb8fe66b3 (diff) | |
Generate warning settings for Android framework
Bug: b/66996870
Android wants to build with warnings as errors. Keep the external/skia
warnings in sync with other Skia builds by pulling them from the json
generated by GN.
Fix a couple small errors that show up in the framework build.
Uploaded in response to AOSP's
https://android-review.googlesource.com/#/c/platform/external/skia/+/498211/
Change-Id: I4d791d43a9b00f9d6b79ecf16839716f241cba99
Reviewed-on: https://skia-review.googlesource.com/55703
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
| -rw-r--r-- | src/gpu/GrProcessor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 7ea597221b..b8ca63e7a9 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -93,7 +93,9 @@ void GrXPFactoryTestFactory::VerifyFactoryCount() { // memory barrier between accesses of a context on different threads. Also, there may be multiple // GrContexts and those contexts may be in use concurrently on different threads. namespace { +#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) static SkSpinlock gProcessorSpinlock; +#endif class MemoryPoolAccessor { public: |