[Discord] jsc-android fixes

discord · Jul 18, 2024 · f22d419 · f22d419
1 parent 4343134
commit f22d419
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -95,6 +95,7 @@
     "jest": "^29.6.3",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.14.0",
+    "jsc-android": "^250231.0.0",
     "metro-babel-register": "^0.80.0",
     "metro-memory-fs": "^0.80.0",
     "micromatch": "^4.0.4",

diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts
@@ -401,7 +401,7 @@ val prepareGlog by
 // Create Android native library module based on jsc from npm
 val prepareJSC by
     tasks.registering(PrepareJSCTask::class) {
-      jscPackagePath.set("$rootDir/../../discord_app/node_modules/jsc-android")
+      jscPackagePath.set(project.findProperty("JSC_ANDROID_PATH_OVERRIDE")?.toString() ?: findNodeModulePath(projectDir, "jsc-android"))
       outputDir = project.layout.buildDirectory.dir("third-party-ndk/jsc")
     }
 
@@ -445,7 +445,6 @@ fun findNodeModulePath(baseDir: File, packageName: String): String? {
   while (basePath != null) {
     val candidatePath = Paths.get(basePath.toString(), "node_modules", packageName)
     if (candidatePath.toFile().exists()) {
-        println("NODEMODULES " + candidatePath.toString())
       return candidatePath.toString()
     }
     basePath = basePath.parent