Rename font-subset to font_subset. (flutter/engine#49051)

For consistency, I don't think we have any other tools with `-`'s.

I'll be honest - this seemed easier than teaching the header guard tool
how to handle `-`'s in directory names, but if you feel strongly about
it I can revert.
This commit is contained in:
Matan Lurey 2023-12-14 15:16:09 -08:00 committed by GitHub
parent 10bb1d87b6
commit 2ecbd2ff7d
22 changed files with 12 additions and 12 deletions

View File

@ -114,7 +114,7 @@ group("flutter") {
public_deps += [
"//flutter/shell/testing",
"//flutter/tools/const_finder",
"//flutter/tools/font-subset",
"//flutter/tools/font_subset",
]
}

View File

@ -70,7 +70,7 @@
"targets": [
"flutter/build/archives:artifacts",
"flutter/build/archives:dart_sdk_archive",
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter/shell/platform/linux:flutter_gtk"
]
}

View File

@ -103,7 +103,7 @@
"flutter/build/archives:embedder",
"flutter/build/archives:flutter_patched_sdk",
"flutter/build/dart:copy_dart_sdk",
"flutter/tools/font-subset"
"flutter/tools/font_subset"
]
},
"tests": [

View File

@ -21,7 +21,7 @@
"ninja": {
"config": "host_debug_unopt",
"targets": [
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter:unittests",
"flutter/build/dart:copy_dart_sdk",
"flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",

View File

@ -41,7 +41,7 @@
"flutter/build/archives:flutter_embedder_framework",
"flutter/build/dart:copy_dart_sdk",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter:unittests"
]
},
@ -170,7 +170,7 @@
"flutter/build/dart:copy_dart_sdk",
"flutter/impeller/golden_tests:impeller_golden_tests",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter:unittests"
]
},
@ -227,7 +227,7 @@
"ninja": {
"config": "mac_debug_arm64",
"targets": [
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter/build/archives:archive_gen_snapshot",
"flutter/build/archives:artifacts",
"flutter/build/archives:dart_sdk_archive",
@ -318,7 +318,7 @@
"ninja": {
"config": "mac_release_arm64",
"targets": [
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter/build/archives:artifacts",
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
]

View File

@ -37,7 +37,7 @@
"targets": [
"flutter/build/archives:artifacts",
"flutter/build/archives:embedder",
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter/build/archives:dart_sdk_archive",
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
"flutter/build/archives:windows_flutter"

View File

@ -36,7 +36,7 @@
"flutter:unittests",
"flutter/build/archives:artifacts",
"flutter/build/archives:embedder",
"flutter/tools/font-subset",
"flutter/tools/font_subset",
"flutter/build/archives:dart_sdk_archive",
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
"flutter/build/archives:windows_flutter"

View File

@ -39,7 +39,7 @@ FONTS_DIR = os.path.join(
BUILDROOT_DIR, 'flutter', 'third_party', 'txt', 'third_party', 'fonts'
)
ROBOTO_FONT_PATH = os.path.join(FONTS_DIR, 'Roboto-Regular.ttf')
FONT_SUBSET_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'tools', 'font-subset')
FONT_SUBSET_DIR = os.path.join(BUILDROOT_DIR, 'flutter', 'tools', 'font_subset')
ENCODING = 'UTF-8'

View File

@ -35,7 +35,7 @@ generated_file("font_entitlement_config") {
deps = [ ":_font-subset" ]
}
zip_bundle("font-subset") {
zip_bundle("font_subset") {
if (is_mac) {
# Mac artifacts sometimes use mac and sometimes darwin. Standardizing the
# names will require changes in the list of artifacts the tool is downloading.