diff --git a/.gitmodules b/.gitmodules index 7fd7bd83d8..dbc87e9b9d 100644 --- 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 index 911ccd864c..097edbaba6 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit 911ccd864c77a8d9c91066858dfbd4517f9e83e2 +Subproject commit 097edbaba661cc7cac3f02d31ff4b465d87286c4 diff --git a/externals/skia b/externals/skia index 89907a0ce7..c3feddb877 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 89907a0ce7c0c883898b8c88b55b7b7f733f7058 +Subproject commit c3feddb877388498cc9a491e9504268a53607b15 diff --git a/scripts/build-libgrapheme-ios.ts b/scripts/build-libgrapheme-ios.ts deleted file mode 100644 index 7d21e64457..0000000000 --- a/scripts/build-libgrapheme-ios.ts +++ /dev/null @@ -1,48 +0,0 @@ -import os from "os"; -import fs from "fs"; -import { executeCmdSync } from "./utils"; - -// Build instructions for building build-libgrapheme-ios -export const buildLibGraphemeiOS = async () => { - // Empty the generate_headers.py file - console.log("Patching the Skia buildscript 'generate_headers.py'..."); - const file = fs.openSync( - "./third_party/libgrapheme/generate_headers.py", - "w" - ); - fs.writeSync( - file, - "print('[generate_headers.py] This file has been patched by the RN Skia build script.')" - ); - fs.closeSync(file); - console.log("Finished patching generate_headers.py."); - - console.log("Building libgrapheme for iOS..."); - - // Change to the third_party/libgrapheme directory - const currentDir = process.cwd(); - try { - process.chdir("./third_party/externals/libgrapheme"); - // Check if the output has been created - if so skip the build - if (!fs.existsSync("./gen/case.o")) { - // Run configure - console.log("Configuring libgrapheme..."); - executeCmdSync("./configure"); - // Up the file handle limit on mac: - if (os.platform() === "darwin") { - console.log( - "Extending file handle count on Mac to avoid `Too many open files` error..." - ); - executeCmdSync("ulimit -n 4096"); - } - // Run make - console.log("Building libgrapheme..."); - executeCmdSync("make"); - console.log("libgrapheme successfully built."); - } else { - console.log("Skipping configuring libgrapheme as it is already built."); - } - } finally { - process.chdir(currentDir); - } -}; diff --git a/scripts/build-skia-ios-framework.ts b/scripts/build-skia-ios-framework.ts index ee6754ac9f..cdf1739c4b 100644 --- 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."); \ No newline at end of file diff --git a/scripts/build-skia.ts b/scripts/build-skia.ts index c5a3a72216..c985e0d893 100644 --- 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 index f00e7bd5c5..4680e5a76a 100644 --- 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, - }, - ], + ] }, };