Move SkRandom and SkFixed into base SkFixed requires a shim for Android [1]. Client CL: - https://chromium-review.googlesource.com/c/chromium/src/+/4242158 SkFixed.h was moved to include/private/base because it is used elsewhere in include/. SkRandom was not, so it is now in src/base. See SkFixed.h, SkRandom.h, and the Bazel files for actual changes, everything else was just find and replace. The fiddles (docs/examples/*) were changed to use <random> because we only want those to demonstrate Skia's public APIs. The shim for SkTemplates.h no longer appears used. [1] https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/libs/hwui/SkiaInterpolator.cpp#20 Change-Id: Ie4fddd33ffb4141c1f0dc051712407d0da64aa4b Bug: skia:13983 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/641776 Reviewed-by: Brian Osman <[email protected]> Reviewed-by: Jim Van Verth <[email protected]> Commit-Queue: Kevin Lubick <[email protected]>
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp index 1390fb4..74f778e 100644 --- a/tests/GrMemoryPoolTest.cpp +++ b/tests/GrMemoryPoolTest.cpp
@@ -7,7 +7,7 @@ #include "include/private/base/SkTArray.h" #include "include/private/base/SkTDArray.h" -#include "include/utils/SkRandom.h" +#include "src/base/SkRandom.h" #include "src/gpu/ganesh/GrMemoryPool.h" #include "tests/Test.h"