From 6000b562a305ecc218d021941a94dd9350b88ce6 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 10 Oct 2023 12:33:19 -0700 Subject: [PATCH 1/5] Prepare to move new folders into third_party. --- third_party/.gitignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 third_party/.gitignore diff --git a/third_party/.gitignore b/third_party/.gitignore new file mode 100644 index 0000000000000..07dbeedd55957 --- /dev/null +++ b/third_party/.gitignore @@ -0,0 +1,19 @@ +# Ignore everything by default, as these come from gclient/DEPS. +# We'll explicitly include the folders we want to track. +* + +# Include the .gitignore file itself and .clang-tidy. +!.gitignore +!.clang-tidy + +# Include folders that have hand-written code (not DEPS). +!accessibility/ +!canvaskit/ +!ninja/ +!spring_animation/ +!test_shaders/ +!tonic/ +!txt/ +!web_locale_keymap/ +!web_test_fonts/ +!web_unicode/ From 981da7891a88a4b0e6114a5006293554de779b74 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 10 Oct 2023 12:35:59 -0700 Subject: [PATCH 2/5] Update LICENSES. --- ci/licenses_golden/excluded_files | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index fd649bd5f90a3..96787967e4244 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -391,6 +391,7 @@ ../../../flutter/sky/tools/objcopy.py ../../../flutter/testing ../../../flutter/third_party/.clang-tidy +../../../flutter/third_party/.gitignore ../../../flutter/third_party/accessibility/README.md ../../../flutter/third_party/accessibility/ax/ax_enum_util_unittest.cc ../../../flutter/third_party/accessibility/ax/ax_event_generator_unittest.cc From 3e48a3a10dba8e00fb66f146415acca5881fdef4 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 10 Oct 2023 13:03:47 -0700 Subject: [PATCH 3/5] Add minimal README. --- third_party/.gitignore | 1 + third_party/README.md | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 third_party/README.md diff --git a/third_party/.gitignore b/third_party/.gitignore index 07dbeedd55957..068f402954f0f 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -5,6 +5,7 @@ # Include the .gitignore file itself and .clang-tidy. !.gitignore !.clang-tidy +!README.md # Include folders that have hand-written code (not DEPS). !accessibility/ diff --git a/third_party/README.md b/third_party/README.md new file mode 100644 index 0000000000000..ae435e36c8efb --- /dev/null +++ b/third_party/README.md @@ -0,0 +1,24 @@ +# `flutter/third_party` + +This directory contains third-party code that is a combination of: + +- Code that is vendored into the Flutter repository, from an external source. + For example, we might have `third_party/glfw`, which contains the GLFW + library, vendored from an external repository. + + > 💡 **TIP**: See [`DEPS`](../DEPS) for where these sources are declared. + +- Code that originates from another repository, but is copied (sometimes with + alterations) into the Flutter repository. For an example, see + [`third_party/spring_animation`](spring_animation/README.md). + +- Code that is licensed separately from the rest of the Flutter repository. + For example, see [`third_party/txt`](txt/). + +When adding a new _externally_ sourced third-party library, update `.gitignore`: + +```diff +# Ignores all third_party/ directories except for the ones we want to track. + ++ !{folder_name}/ +``` From 5d24a4c6247c364318430afaf1677af95cb09fd6 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 10 Oct 2023 13:18:57 -0700 Subject: [PATCH 4/5] Fix LICENSES, again. --- ci/licenses_golden/excluded_files | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 96787967e4244..9177724366207 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -392,6 +392,7 @@ ../../../flutter/testing ../../../flutter/third_party/.clang-tidy ../../../flutter/third_party/.gitignore +../../../flutter/third_party/README.md ../../../flutter/third_party/accessibility/README.md ../../../flutter/third_party/accessibility/ax/ax_enum_util_unittest.cc ../../../flutter/third_party/accessibility/ax/ax_event_generator_unittest.cc From 735390bbc6e188db0f705495f7d441d29431096a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 10 Oct 2023 13:34:34 -0700 Subject: [PATCH 5/5] Address comments. --- .gitignore | 3 --- third_party/.gitignore | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c66ae6504bef8..a19d20d383802 100644 --- a/.gitignore +++ b/.gitignore @@ -28,9 +28,6 @@ pubspec.lock docs/doxygen/ xcuserdata -third_party/gn/ -third_party/ninja/ninja* - # Miscellaneous *.class *.lock diff --git a/third_party/.gitignore b/third_party/.gitignore index 068f402954f0f..45ae89eb3d05d 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -7,6 +7,9 @@ !.clang-tidy !README.md +# Allow custom README.flutter files in each folder. +**/README.flutter + # Include folders that have hand-written code (not DEPS). !accessibility/ !canvaskit/