Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the externals/harfbuzz submodule #1599

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Remove the externals/harfbuzz submodule #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove the externals/harfbuzz submodule 
Use the gn targets in skia to do all the work
  • Loading branch information
@mattleibow
mattleibow committed Feb 1, 2021
commit e472aed0d82d5c7a79cc675d86d866921fd9fd9a
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
path = externals/depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
branch = master
[submodule "externals/harfbuzz"]
path = externals/harfbuzz
url = https://github.com/harfbuzz/harfbuzz.git
branch = 2.6.1
[submodule "docs"]
path = docs
url = https://github.com/mono/SkiaSharp-API-docs
Expand Down
2 changes: 1 addition & 1 deletion cake/native-shared.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (!string.IsNullOrEmpty(PYTHON_EXE) && FileExists(PYTHON_EXE)) {

DirectoryPath DEPOT_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/depot_tools"));
DirectoryPath SKIA_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/skia"));
DirectoryPath HARFBUZZ_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/harfbuzz"));
DirectoryPath HARFBUZZ_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/skia/third_party/externals/harfbuzz"));

var EXE_EXTENSION = IsRunningOnWindows() ? ".exe" : "";
var GN_EXE = Argument("gn", EnvironmentVariable("GN_EXE") ?? SKIA_PATH.CombineWithFilePath($"bin/gn{EXE_EXTENSION}").FullPath);
Expand Down
1 change: 0 additions & 1 deletion externals/harfbuzz
Open in desktop
Submodule harfbuzz deleted from be97e9
2 changes: 1 addition & 1 deletion native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include $(CLEAR_VARS)

cmd-strip = $(PRIVATE_STRIP) --strip-all $(call host-path,$1)

src_root = ../../../../externals/harfbuzz/src
src_root = ../../../../externals/skia/third_party/externals/harfbuzz/src

LOCAL_MODULE := HarfBuzzSharp

Expand Down
112 changes: 56 additions & 56 deletions native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion native/tizen/libHarfBuzzSharp/project_def.prop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type = sharedLib
profile = mobile-4.0

harfbuzz_root = ../../../externals/harfbuzz
harfbuzz_root = ../../../externals/skia/third_party/externals/harfbuzz

APPNAME = HarfBuzzSharp

Expand Down
112 changes: 56 additions & 56 deletions native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

382 changes: 191 additions & 191 deletions native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

382 changes: 191 additions & 191 deletions native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion utils/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- gener
Or:

```pwsh
dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libHarfBuzzSharp.json --skia externals/harfbuzz --output binding/HarfBuzzSharp.Shared/HarfBuzzApi.generated.cs
dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libHarfBuzzSharp.json --skia externals/skia/third_party/externals/harfbuzz --output binding/HarfBuzzSharp.Shared/HarfBuzzApi.generated.cs
```

* `--config binding/libSkiaSharp.json`
Expand Down