mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Roll Skia from 39122d445939 to f5bd4e4b9f6b (2 revisions) (flutter/engine#27275)
This commit is contained in:
parent
3211cc9157
commit
3a4481da42
2
DEPS
2
DEPS
@ -27,7 +27,7 @@ vars = {
|
||||
'skia_git': 'https://skia.googlesource.com',
|
||||
# OCMock is for testing only so there is no google clone
|
||||
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
|
||||
'skia_revision': '39122d4459391e4d407e7efc05f62e65fac2881f',
|
||||
'skia_revision': 'f5bd4e4b9f6bd1b508dd5eb67129bfca528ef39b',
|
||||
|
||||
# When updating the Dart revision, ensure that all entries that are
|
||||
# dependencies of Dart are also updated to match the entries in the
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Signature: 88137b86606011350f5ba037196f64d6
|
||||
Signature: 580122ed540572166eea8d68bd081981
|
||||
|
||||
UNUSED LICENSES:
|
||||
|
||||
|
||||
@ -293,6 +293,7 @@ angle
|
||||
boringssl
|
||||
etc1
|
||||
khronos
|
||||
libwebp
|
||||
txt
|
||||
vulkan
|
||||
vulkan-deps
|
||||
@ -11296,6 +11297,38 @@ libwebp
|
||||
|
||||
Copyright 2017 Google Inc. All Rights Reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in
|
||||
the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
|
||||
* Neither the name of Google nor the names of its contributors may
|
||||
be used to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
--------------------------------------------------------------------------------
|
||||
libwebp
|
||||
|
||||
Copyright 2018 Google Inc. All Rights Reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user