Move //third_party/tinygltf to //flutter/third_party/tinygltf (flutter/engine#48852)

Work towards https://github.com/flutter/flutter/issues/67373.
This commit is contained in:
Matan Lurey
2023-12-08 16:47:24 -08:00
committed by GitHub
parent edbe663168
commit f4f06d00fb
8 changed files with 12 additions and 11 deletions

2
DEPS
View File

@@ -709,7 +709,7 @@ deps = {
'src/flutter/third_party/imgui':
Var('flutter_git') + '/third_party/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
'src/third_party/tinygltf':
'src/flutter/third_party/tinygltf':
Var('flutter_git') + '/third_party/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
'src/third_party/json':

View File

@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
source_root = "//third_party/tinygltf"
source_root = "//flutter/third_party/tinygltf"
source_set("tinygltf") {
public = [ "$source_root/tiny_gltf.h" ]
@@ -16,8 +16,9 @@ source_set("tinygltf") {
"$source_root/third_party/include",
]
sources =
[ "//flutter/build/secondary/third_party/tinygltf/tinygltf_stub.cc" ]
sources = [
"//flutter/build/secondary/flutter/third_party/tinygltf/tinygltf_stub.cc",
]
deps = [ "//third_party/json" ]
}

View File

@@ -8,4 +8,4 @@
#define TINYGLTF_NO_INCLUDE_JSON
#define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "third_party/tinygltf/tiny_gltf.h"
#include "flutter/third_party/tinygltf/tiny_gltf.h"

View File

@@ -1043,6 +1043,7 @@
../../../flutter/third_party/sqlite/README.md
../../../flutter/third_party/sqlite/VERSION
../../../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
@@ -3020,7 +3021,6 @@
../../../third_party/root_certificates/codereview.settings
../../../third_party/stb
../../../third_party/swiftshader
../../../third_party/tinygltf
../../../third_party/vulkan-deps/.git
../../../third_party/vulkan-deps/.gitattributes
../../../third_party/vulkan-deps/.gitignore

View File

@@ -1,2 +1,2 @@
Signature: 83a3e38f16c777ebdac3541b8a5c4533
Signature: 5dbd06463802f22fb8c461c9bda734b8

View File

@@ -56,7 +56,7 @@ impeller_component("importer_lib") {
# All third_party deps must be reflected below in the scenec_license
# target.
"//third_party/tinygltf",
"//flutter/third_party/tinygltf",
]
}
@@ -85,7 +85,7 @@ generated_file("scenec_license") {
"",
"### tinygltf",
"",
read_file("//third_party/tinygltf/LICENSE", "string"),
read_file("//flutter/third_party/tinygltf/LICENSE", "string"),
]
}

View File

@@ -13,11 +13,11 @@
#include <vector>
#include "flutter/fml/mapping.h"
#include "flutter/third_party/tinygltf/tiny_gltf.h"
#include "impeller/geometry/matrix.h"
#include "impeller/scene/importer/conversions.h"
#include "impeller/scene/importer/scene_flatbuffers.h"
#include "impeller/scene/importer/vertices_builder.h"
#include "third_party/tinygltf/tiny_gltf.h"
namespace impeller {
namespace scene {

View File

@@ -91,6 +91,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/skia/third_party/vello', // not linked in
r'flutter/third_party/skia/tools', // contains nothing that ends up in the binary executable
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/wuffs/docs',
r'flutter/third_party/wuffs/script',
@@ -184,7 +185,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/root_certificates/certdata.txt',
r'third_party/stb',
r'third_party/swiftshader', // only used on hosts for tests
r'third_party/tinygltf',
r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
r'third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps