Fix build error in android-release

Signed-off-by: HyukWoo Park <[email protected]>
Samsung · Nov 5, 2024 · 61a3784 · 61a3784
1 parent 7e93af8
commit 61a3784
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -45,6 +45,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
+    - name: Install Packages
+      run: |
+        brew update
+        brew install ninja pkg-config icu4c
     - name: Set up JDK
       uses: actions/[email protected]
       with:

diff --git a/build/android/escargot/build.gradle b/build/android/escargot/build.gradle
@@ -110,8 +110,17 @@ task buildCMakeNativeNoNDK(type: Exec) {
             }
             os.toString().trim()
         }
-        environment("PKG_CONFIG_PATH", "/usr/local/opt/icu4c/lib/pkgconfig")
-        commandLine "/usr/bin/env", "cmake", "-DESCARGOT_HOST=darwin", "-DESCARGOT_ARCH=x64", "-DESCARGOT_OUTPUT=static_lib", "-DUNDER_NDK=OFF", "-DESCARGOT_LIBICU_SUPPORT_WITH_DLOPEN=OFF",
+        var icu4cPath = new ByteArrayOutputStream().withStream { os ->
+            exec {
+                commandLine "sh", "-c", "brew --prefix icu4c"
+                standardOutput = os
+            }
+            os.toString().trim()
+        }
+        var pkgConfigPath = icu4cPath + "/lib/pkgconfig"
+        environment("PKG_CONFIG_PATH", pkgConfigPath)
+        commandLine "/usr/bin/env", "cmake", "-DESCARGOT_HOST=darwin", "-DESCARGOT_ARCH=x64", "-DESCARGOT_OUTPUT=static_lib", "-DUNDER_NDK=OFF",
+                "-DESCARGOT_LIBICU_SUPPORT_WITH_DLOPEN=OFF",
                 "-DJAVA_HOME=" + javaHome, "-DJAVA_INCLUDE_PATH=" + javaHome + "/include",
                 "-DJAVA_INCLUDE_PATH2=" + javaHome + "/include/darwin", "-DJAVA_AWT_INCLUDE_PATH=" + javaHome + "/include",
                 srcForNativeNoNDK.absolutePath