Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 0a084a6

Browse files
authored
Migrate inja, sqlite, libtess2 to //flutter/third_party. (#47408)
Part of flutter/flutter#67373
1 parent 2fb824c commit 0a084a6

File tree

12 files changed

+360
-358
lines changed

12 files changed

+360
-358
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,13 +610,13 @@ deps = {
610610
'src/third_party/zlib':
611611
Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + Var('dart_zlib_rev'),
612612

613-
'src/third_party/inja':
613+
'src/flutter/third_party/inja':
614614
Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
615615

616-
'src/third_party/libtess2':
616+
'src/flutter/third_party/libtess2':
617617
Var('flutter_git') + '/third_party/libtess2' + '@' + '725e5e08ec8751477565f1d603fd7eb9058c277c',
618618

619-
'src/third_party/sqlite':
619+
'src/flutter/third_party/sqlite':
620620
Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
621621

622622
'src/third_party/pyyaml':

build/secondary/third_party/inja/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
source_root = "//third_party/inja"
5+
source_root = "//flutter/third_party/inja"
66

77
config("inja_public_config") {
88
include_dirs = [ "$source_root/include" ]

build/secondary/third_party/libtess2/BUILD.gn

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5+
source_root = "//flutter/third_party/libtess2"
6+
57
source_set("libtess2") {
6-
public = [ "//third_party/libtess2/Include/tesselator.h" ]
8+
public = [ "$source_root/Include/tesselator.h" ]
79

8-
include_dirs = [ "//third_party/libtess2/Include/" ]
10+
include_dirs = [ "$source_root/Include/" ]
911

1012
configs -= [ "//build/config/compiler:chromium_code" ]
1113
configs += [ "//build/config/compiler:no_chromium_code" ]
1214

1315
sources = [
14-
"//third_party/libtess2/Source/bucketalloc.c",
15-
"//third_party/libtess2/Source/bucketalloc.h",
16-
"//third_party/libtess2/Source/dict.c",
17-
"//third_party/libtess2/Source/dict.h",
18-
"//third_party/libtess2/Source/geom.c",
19-
"//third_party/libtess2/Source/geom.h",
20-
"//third_party/libtess2/Source/mesh.c",
21-
"//third_party/libtess2/Source/mesh.h",
22-
"//third_party/libtess2/Source/priorityq.c",
23-
"//third_party/libtess2/Source/priorityq.h",
24-
"//third_party/libtess2/Source/sweep.c",
25-
"//third_party/libtess2/Source/sweep.h",
26-
"//third_party/libtess2/Source/tess.c",
27-
"//third_party/libtess2/Source/tess.h",
16+
"$source_root/Source/bucketalloc.c",
17+
"$source_root/Source/bucketalloc.h",
18+
"$source_root/Source/dict.c",
19+
"$source_root/Source/dict.h",
20+
"$source_root/Source/geom.c",
21+
"$source_root/Source/geom.h",
22+
"$source_root/Source/mesh.c",
23+
"$source_root/Source/mesh.h",
24+
"$source_root/Source/priorityq.c",
25+
"$source_root/Source/priorityq.h",
26+
"$source_root/Source/sweep.c",
27+
"$source_root/Source/sweep.h",
28+
"$source_root/Source/tess.c",
29+
"$source_root/Source/tess.h",
2830
]
2931
}

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function verify_licenses() (
156156

157157
local actualLicenseCount
158158
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
159-
local expectedLicenseCount=44 # When changing this number: Update the error message below as well describing the newly expected license types.
159+
local expectedLicenseCount=53 # When changing this number: Update the error message below as well describing the newly expected license types.
160160

161161
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
162162
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,27 @@
518518
../../../flutter/third_party/gtest-parallel/gtest_parallel_mocks.py
519519
../../../flutter/third_party/gtest-parallel/gtest_parallel_tests.py
520520
../../../flutter/third_party/imgui
521+
../../../flutter/third_party/inja/.clang-format
522+
../../../flutter/third_party/inja/.git
523+
../../../flutter/third_party/inja/.github
524+
../../../flutter/third_party/inja/.gitignore
525+
../../../flutter/third_party/inja/CMakeLists.txt
526+
../../../flutter/third_party/inja/README.md
527+
../../../flutter/third_party/inja/cmake
528+
../../../flutter/third_party/inja/doc
529+
../../../flutter/third_party/inja/meson.build
530+
../../../flutter/third_party/inja/requirements.txt
531+
../../../flutter/third_party/inja/scripts/amalgamate_config.json
532+
../../../flutter/third_party/inja/test
533+
../../../flutter/third_party/inja/third_party/amalgamate
534+
../../../flutter/third_party/inja/third_party/include/doctest
535+
../../../flutter/third_party/libtess2/.git
536+
../../../flutter/third_party/libtess2/.gitignore
537+
../../../flutter/third_party/libtess2/Contrib/nanosvg.c
538+
../../../flutter/third_party/libtess2/Contrib/nanosvg.h
539+
../../../flutter/third_party/libtess2/Example
540+
../../../flutter/third_party/libtess2/README.md
541+
../../../flutter/third_party/libtess2/alg_outline.md
521542
../../../flutter/third_party/ninja
522543
../../../flutter/third_party/rapidjson/.git
523544
../../../flutter/third_party/rapidjson/.gitattributes
@@ -579,6 +600,13 @@
579600
../../../flutter/third_party/shaderc/utils/remove-file-by-suffix.py
580601
../../../flutter/third_party/shaderc/utils/update_build_version.py
581602
../../../flutter/third_party/spring_animation/README.md
603+
../../../flutter/third_party/sqlite/.git
604+
../../../flutter/third_party/sqlite/.gitignore
605+
../../../flutter/third_party/sqlite/GIT_REVISION
606+
../../../flutter/third_party/sqlite/LAST_UPDATE
607+
../../../flutter/third_party/sqlite/Makefile
608+
../../../flutter/third_party/sqlite/README.md
609+
../../../flutter/third_party/sqlite/VERSION
582610
../../../flutter/third_party/test_shaders
583611
../../../flutter/third_party/tonic/.clang-format
584612
../../../flutter/third_party/tonic/AUTHORS
@@ -2323,20 +2351,6 @@
23232351
../../../third_party/icu/source/tools/toolutil/sources.txt
23242352
../../../third_party/icu/source/tools/tzcode/Makefile.in
23252353
../../../third_party/icu/source/tools/tzcode/readme.txt
2326-
../../../third_party/inja/.clang-format
2327-
../../../third_party/inja/.git
2328-
../../../third_party/inja/.github
2329-
../../../third_party/inja/.gitignore
2330-
../../../third_party/inja/CMakeLists.txt
2331-
../../../third_party/inja/README.md
2332-
../../../third_party/inja/cmake
2333-
../../../third_party/inja/doc
2334-
../../../third_party/inja/meson.build
2335-
../../../third_party/inja/requirements.txt
2336-
../../../third_party/inja/scripts/amalgamate_config.json
2337-
../../../third_party/inja/test
2338-
../../../third_party/inja/third_party/amalgamate
2339-
../../../third_party/inja/third_party/include/doctest
23402354
../../../third_party/java
23412355
../../../third_party/json/.clang-format
23422356
../../../third_party/json/.clang-tidy
@@ -2442,13 +2456,6 @@
24422456
../../../third_party/libpng/projects
24432457
../../../third_party/libpng/scripts
24442458
../../../third_party/libpng/tests
2445-
../../../third_party/libtess2/.git
2446-
../../../third_party/libtess2/.gitignore
2447-
../../../third_party/libtess2/Contrib/nanosvg.c
2448-
../../../third_party/libtess2/Contrib/nanosvg.h
2449-
../../../third_party/libtess2/Example
2450-
../../../third_party/libtess2/README.md
2451-
../../../third_party/libtess2/alg_outline.md
24522459
../../../third_party/libwebp/.cmake-format.py
24532460
../../../third_party/libwebp/.git
24542461
../../../third_party/libwebp/.gitattributes
@@ -2949,13 +2956,6 @@
29492956
../../../third_party/skia/toolchain/ndk_linux_arm64_toolchain_config.bzl
29502957
../../../third_party/skia/toolchain/utils.bzl
29512958
../../../third_party/skia/tools
2952-
../../../third_party/sqlite/.git
2953-
../../../third_party/sqlite/.gitignore
2954-
../../../third_party/sqlite/GIT_REVISION
2955-
../../../third_party/sqlite/LAST_UPDATE
2956-
../../../third_party/sqlite/Makefile
2957-
../../../third_party/sqlite/README.md
2958-
../../../third_party/sqlite/VERSION
29592959
../../../third_party/stb
29602960
../../../third_party/swiftshader
29612961
../../../third_party/tinygltf

0 commit comments

Comments
 (0)