Try linux arm64 #88

Author: tonsky

.github/workflows/build.yml

@@ -35,13 +35,15 @@ jobs:
       - run: |
           echo "JAVA_HOME=$JAVA_HOME_11_arm64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_arm64/bin" >> $GITHUB_PATH
+      # x64
       - run: python3 script/build.py --arch x64
       - run: python3 script/test.py
       - run: python3 script/package_platform.py --arch x64
       - uses: actions/upload-artifact@v4
         with:
           name: macos-x64-jars
           path: target/skija-macos-x64-*
+      # arm64
       - run: python3 script/clean.py
       - run: python3 script/build.py --arch arm64
       - run: python3 script/test.py
@@ -58,12 +60,13 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
           sudo apt-get update
-          sudo apt-get --quiet --yes install ninja-build libglu1-mesa-dev libegl-dev g\+\+-9-aarch64-linux-gnu libwayland-dev libglvnd-dev libegl1-mesa libegl1-mesa-dev
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+          sudo apt-get --quiet --yes install ninja-build libglu1-mesa-dev libegl-dev g\+\+-10-aarch64-linux-gnu libwayland-dev libglvnd-dev libegl1-mesa libegl1-mesa-dev
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
           sudo update-alternatives --config gcc
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
+      # x64
       - run: python3 script/build.py
       - run: python3 script/package_shared.py
       - uses: actions/upload-artifact@v4
@@ -76,14 +79,14 @@ jobs:
         with:
           name: linux-x64-jars
           path: target/skija-linux-x64-*
-      # Disabled until https://github.com/HumbleUI/SkiaBuild/issues/8
-      # - run: python3 script/clean.py
-      # - run: python3 script/build.py --arch arm64
-      # - run: python3 script/package_platform.py --arch arm64
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: linux-arm64-jars
-      #     path: target/skija-linux-arm64-*
+      # arm64
+      - run: python3 script/clean.py
+      - run: python3 script/build.py --arch arm64
+      - run: python3 script/package_platform.py --arch arm64
+      - uses: actions/upload-artifact@v4
+        with:
+          name: linux-arm64-jars
+          path: target/skija-linux-arm64-*
 
   build_windows:
     runs-on: windows-2022
@@ -130,10 +133,10 @@ jobs:
         with:
           name: linux-x64-jars
           path: target
-      # - uses: actions/download-artifact@v4
-      #   with:
-      #     name: linux-arm64-jars
-      #     path: target
+      - uses: actions/download-artifact@v4
+        with:
+          name: linux-arm64-jars
+          path: target
       - uses: actions/download-artifact@v4
         with:
           name: windows-x64-jars

script/cross_compile.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env python3
-import build_utils, subprocess
+import build_utils, os, subprocess
 from typing import List
 
 def extract_deb(url: str, name: str, native_build_dir: str):
@@ -10,7 +10,7 @@ def extract_deb(url: str, name: str, native_build_dir: str):
   return target
 
 def setup_linux_arm64(native_build_dir: str, cmake_args: List[str]):
-  deps_dir = f'{native_build_dir}/deps'
+  deps_dir = os.path.abspath(f'{native_build_dir}/deps')
   build_utils.makedirs(deps_dir)
 
   # libfreetype.so
@@ -46,10 +46,24 @@ def setup_linux_arm64(native_build_dir: str, cmake_args: List[str]):
     f'{deps_dir}/libfontconfig.so'
   )
 
+  # libEGL.so
+  libegl1 = extract_deb(
+    'http://ftp.us.debian.org/debian/pool/main/libg/libglvnd/libegl1_1.3.2-1_arm64.deb',
+    'libegl1',
+    native_build_dir
+  )
+  build_utils.copy_newer(
+    f'{libegl1}/usr/lib/aarch64-linux-gnu/libEGL.so.1.1.0',
+    f'{deps_dir}/libEGL.so'
+  )
+
   cmake_args += [
     '-DCMAKE_SYSTEM_NAME=Linux',
     '-DCMAKE_SYSTEM_PROCESSOR=aarch64',
-    '-DCMAKE_C_COMPILER=/usr/bin/aarch64-linux-gnu-gcc-9',
-    '-DCMAKE_CXX_COMPILER=/usr/bin/aarch64-linux-gnu-g++-9',
-    '-DDEPS_DIR=' + deps_dir
+    '-DCMAKE_C_COMPILER=/usr/bin/aarch64-linux-gnu-gcc-10',
+    '-DCMAKE_CXX_COMPILER=/usr/bin/aarch64-linux-gnu-g++-10',
+    '-DFREETYPE_LIBRARY=' + f'{deps_dir}/libfreetype.so',
+    '-DFONTCONFIG_LIBRARY=' + f'{deps_dir}/libfontconfig.so',
+    '-DSKIA_EGL_LIBRARY=' + f'{deps_dir}/libEGL.so',
+    '-DSKIA_GL_LIBRARY=' + f'{deps_dir}/libGL.so'
   ]