⬆️ Update to Skia m122 (#2111)

Shopify · Jan 24, 2024 · f3042c3 · f3042c3
1 parent 92e6bc9
commit f3042c3
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 72 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "externals/skia"]
 	path = externals/skia
 	url = https://chromium.googlesource.com/skia/
-	branch = chrome/m119
+	branch = chrome/m122
 [submodule "externals/depot_tools"]
 	path = externals/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
diff --git a/externals/depot_tools b/externals/depot_tools
diff --git a/externals/skia b/externals/skia
diff --git a/scripts/build-libgrapheme-ios.ts b/scripts/build-libgrapheme-ios.ts
diff --git a/scripts/build-skia-ios-framework.ts b/scripts/build-skia-ios-framework.ts
@@ -57,4 +57,4 @@ configurations.ios.outputNames.forEach((out) => {
   );
 });
 
-console.log("Frameworks successfully built.");
+console.log("Frameworks successfully built.");
diff --git a/scripts/build-skia.ts b/scripts/build-skia.ts
@@ -189,15 +189,6 @@ try {
   executeCmdSync("PATH=../depot_tools/:$PATH python3 tools/git-sync-deps");
   console.log("gclient sync done");
 
-  // lets check for any dependencies
-  if (platform.dependencies) {
-    console.log(`Found dependencies for platform ${SelectedPlatform}`);
-    platform.dependencies.forEach((dep) => {
-      console.log(`Running dependency ${dep.name}`);
-      dep.executable();
-    });
-  }
-
   try {
     // Configure the platform
     if (!configurePlatform(SelectedPlatform, SelectedTarget)) {

diff --git a/scripts/skia-configuration.ts b/scripts/skia-configuration.ts
@@ -1,6 +1,3 @@
-import { buildLibGraphemeiOS } from "./build-libgrapheme-ios";
-import { executeCmdSync } from "./utils";
-
 const NdkDir: string = process.env.ANDROID_NDK ?? "";
 
 export const BUILD_WITH_PARAGRAPH = true;
@@ -73,7 +70,6 @@ export type Platform = {
   outputRoot: string;
   outputNames: string[];
   options?: Arg[];
-  dependencies?: { name: string; executable: () => void }[];
 };
 
 export const configurations: Configuration = {
@@ -163,12 +159,6 @@ export const configurations: Configuration = {
       "libskottie.a",
       "libsksg.a",
       ...ParagraphOutputs,
-    ],
-    dependencies: [
-      {
-        name: "libgrapheme",
-        executable: buildLibGraphemeiOS,
-      },
-    ],
+    ]
   },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,4 +57,4 @@ configurations.ios.outputNames.forEach((out) => { @@
       );
     });
-    console.log("Frameworks successfully built.");
+    console.log("Frameworks successfully built.");