diff --git a/DEPS b/DEPS index 0ed7a518ec0..b31de7ea014 100644 --- a/DEPS +++ b/DEPS @@ -234,7 +234,6 @@ vars = { "upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git", "upstream_test_reflective_loader": "https://github.com/dart-lang/test_reflective_loader.git", "upstream_test": "https://github.com/dart-lang/test.git", - "upstream_tinygltf": "https://github.com/syoyo/tinygltf.git", "upstream_typed_data": "https://github.com/dart-lang/typed_data.git", "upstream_usage": "https://github.com/dart-lang/usage.git", "upstream_vector_math": "https://github.com/google/vector_math.dart.git", @@ -715,9 +714,6 @@ deps = { 'src/flutter/third_party/imgui': Var('flutter_git') + '/third_party/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d', - 'src/flutter/third_party/tinygltf': - Var('flutter_git') + '/third_party/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148', - 'src/flutter/third_party/json': Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642', diff --git a/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/BUILD.gn b/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/BUILD.gn deleted file mode 100644 index 01dd40f247c..00000000000 --- a/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_root = "//flutter/third_party/tinygltf" - -source_set("tinygltf") { - public = [ "$source_root/tiny_gltf.h" ] - - if (is_clang) { - cflags_cc = [ "-Wno-sign-compare" ] - } - - include_dirs = [ - "$source_root", - "$source_root/third_party/include", - ] - - sources = [ - "//flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc", - ] - - deps = [ "//flutter/third_party/json" ] -} diff --git a/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc b/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc deleted file mode 100644 index 3dc3df3c035..00000000000 --- a/engine/src/flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "nlohmann/json.hpp" - -#define TINYGLTF_IMPLEMENTATION -#define TINYGLTF_NO_INCLUDE_JSON -#define STB_IMAGE_IMPLEMENTATION -#define STB_IMAGE_WRITE_IMPLEMENTATION -#include "flutter/third_party/tinygltf/tiny_gltf.h" diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index eba8a97deb0..02aa416fcd9 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -2973,7 +2973,6 @@ ../../../flutter/third_party/swiftshader/third_party ../../../flutter/third_party/swiftshader/tools/cmake_generate_graphviz/CMakeGraphVizOptions.cmake ../../../flutter/third_party/test_shaders -../../../flutter/third_party/tinygltf ../../../flutter/third_party/tonic/.clang-format ../../../flutter/third_party/tonic/AUTHORS ../../../flutter/third_party/tonic/PATENTS diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 63f920d96f4..d4832a1d97f 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -4785,7 +4785,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/de4a3d63671c2691b18e0bbab243ae008d5cd3c0 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/84fac36df65a2799ee2eaef7095f7fa2950ccbf5 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index f7fa017759f..22136f5b4a8 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: bfa759efc581b40df166470e433a04ce +Signature: 53025d1261891c38c7bccb158862e09f diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index a5461d4c545..d2f2b93306c 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -175,7 +175,6 @@ final Set skippedPaths = { r'flutter/third_party/stb', r'flutter/third_party/swiftshader/third_party', // See: https://github.com/flutter/flutter/issues/145726 r'flutter/third_party/test_shaders', // for tests only - r'flutter/third_party/tinygltf', r'flutter/third_party/txt/third_party/fonts', r'flutter/third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license r'flutter/third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files