Remove the externals/harfbuzz submodule (#1599)

Use the gn targets in skia to do all the work.
mono · Feb 1, 2021 · 7d087c9 · 7d087c9
1 parent c78aae3
commit 7d087c9
Show file tree

Hide file tree

Showing 12 changed files with 610 additions and 615 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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

diff --git a/cake/native-shared.cake b/cake/native-shared.cake
@@ -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);

diff --git a/externals/harfbuzz b/externals/harfbuzz
diff --git a/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk b/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk
@@ -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
 

diff --git a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
diff --git a/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
diff --git a/native/tizen/libHarfBuzzSharp/project_def.prop b/native/tizen/libHarfBuzzSharp/project_def.prop
@@ -1,7 +1,7 @@
 type = sharedLib
 profile = mobile-4.0
 
-harfbuzz_root = ../../../externals/harfbuzz
+harfbuzz_root = ../../../externals/skia/third_party/externals/harfbuzz
 
 APPNAME = HarfBuzzSharp
 

diff --git a/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
diff --git a/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
diff --git a/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj
diff --git a/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj
diff --git a/utils/README.md b/utils/README.md
@@ -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`