diff --git a/DEPS b/DEPS index 4fd1ddf6c88f4..2ba32407d7a25 100644 --- a/DEPS +++ b/DEPS @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '6f31be56e1058997feac2e93ff67fef21ae25eaf', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ab1d95b34a806908a4a4b4cd9a6246e564e59566', # Fuchsia compatibility # diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index b17a4bab2fce2..3352ad56228d4 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -741,7 +741,6 @@ ../../../fuchsia/sdk/linux/pkg/zx/meta.json ../../../fuchsia/sdk/linux/tools ../../../fuchsia/sdk/linux/version_history.json -../../../gpu/README.md ../../../out ../../../third_party/abseil-cpp/.git ../../../third_party/abseil-cpp/.github diff --git a/ci/licenses_golden/licenses_gpu b/ci/licenses_golden/licenses_gpu deleted file mode 100644 index dcffbcface07a..0000000000000 --- a/ci/licenses_golden/licenses_gpu +++ /dev/null @@ -1,38 +0,0 @@ -Signature: ffe64a3daaf0ad982854594ad155dd56 - -==================================================================================================== -LIBRARY: engine -ORIGIN: ../../../gpu/GLES2/gl2chromium.h + ../../../gpu/LICENSE -ORIGIN: ../../../gpu/command_buffer/client/gles2_c_lib_export.h + ../../../gpu/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../gpu/GLES2/gl2chromium.h -FILE: ../../../gpu/command_buffer/client/gles2_c_lib_export.h ----------------------------------------------------------------------------------------------------- -Copyright 2013 The Flutter Authors. 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 Inc. 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 OWNER 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. -==================================================================================================== - -Total license count: 1 diff --git a/tools/fuchsia/build_fuchsia_artifacts.py b/tools/fuchsia/build_fuchsia_artifacts.py index 2defd41a5c027..32af340e9a644 100755 --- a/tools/fuchsia/build_fuchsia_artifacts.py +++ b/tools/fuchsia/build_fuchsia_artifacts.py @@ -235,7 +235,7 @@ def CopyBuildToBucket(runtime_mode, arch, optimized, product): bucket_root = os.path.join(_bucket_directory, 'flutter') licenses_root = os.path.join(_src_root_dir, 'flutter/ci/licenses_golden') license_files = [ - 'licenses_flutter', 'licenses_fuchsia', 'licenses_gpu', 'licenses_skia', + 'licenses_flutter', 'licenses_fuchsia', 'licenses_skia', 'licenses_third_party' ] for license in license_files: