workflows: Adapt build.yml to android-tools-static

Author: meator

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: build
+name: Compile and check on supported systems
 
 on: [push, pull_request]
 
@@ -7,46 +7,46 @@ jobs:
     name: Upload the source
     runs-on: ubuntu-latest
     steps:
+      # - name: Cache source
+      #   id: cache
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: android-tools-source.tar.xz
+      #     key: build-cache
       - name: prep ubuntu
+        # if: steps.cache.outputs.cache-hit != 'true'
         run: |
           sudo apt-get update
           DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq \
-            ${{ matrix.pkgs }} cmake git golang libbrotli-dev \
-            libgtest-dev liblz4-dev libpcre2-dev libprotobuf-dev libunwind-dev \
-            libzstd-dev make pandoc pkg-config protobuf-compiler xz-utils
+            cmake git meson
       - name: checkout
+        # if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/checkout@v4
+        timeout-minutes: 15
         with:
+          path: android-tools-source
           submodules: true
-      - name: git config
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Your Name"
-      - name: get vendor modules
-        run: |
-          cd vendor/boringssl
-          go mod vendor
-      - name: generate man page
-        run: |
-          cd vendor/adb/docs/user
-          pandoc -s -t man adb.1.md -o adb.1
       - name: build & install
+        # if: steps.cache.outputs.cache-hit != 'true'
+        timeout-minutes: 5
         run: |
           export SOURCE_DATE_EPOCH=$(date +%s)
           echo "SOURCE_DATE_EPOCH: ${SOURCE_DATE_EPOCH}"
-          cmake \
-            -DANDROID_TOOLS_USE_BUNDLED_FMT=ON \
-            -DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON \
-            -B build
-          cmake --build build --target package_source
-          for x in sha1sum sha256sum sha512sum b2sum; do
-            printf "$x " && $x ${{ github.workspace }}/build/android-tools-*.tar.xz | cut -d " " -f 1
-          done
+          meson subprojects download --sourcedir android-tools-source
+          patch -d android-tools-source -p1 < android-tools-source/onlypatch.patch
+          meson setup unused_build android-tools-source -Duse_bundled_libusb=true
+          patch -d android-tools-source -Rp1 < android-tools-source/onlypatch.patch
+
+          rm -rf android-tools-source/.git android-tools-source/subprojects/packagecache android-tools-source/vendor/*/.git
+
+          touch android-tools-source/nopatch
+
+          tar -cf android-tools-source.tar android-tools-source/
       - name: upload package_source
         uses: actions/upload-artifact@v4
         with:
           name: package_source
-          path: ${{ github.workspace }}/build/android-tools-*.tar.xz
+          path: android-tools-source.tar
 
   linux:
     runs-on: ubuntu-latest
@@ -55,13 +55,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # gcc is required in clang builds on opensuse; the clang package on its
+          # own cannot compile C++, it is missing vital dependencies (a linker,
+          # some gcc libraries...). gcc-c++ should pull in all of it.
           - os: "opensuse/leap:latest"
             pkgs: "clang gcc11-c++"
             env1: "CC=clang CXX=clang++"
           - os: "opensuse/tumbleweed"
             pkgs: "gcc gcc-c++"
           - os: "opensuse/tumbleweed"
-            pkgs: clang
+            pkgs: "clang gcc-c++"
             env1: "CC=clang CXX=clang++"
           - os: "archlinux:base"
             pkgs: gcc
@@ -97,39 +100,31 @@ jobs:
         if: startsWith(matrix.os, 'opensuse')
         run: |
           zypper -n ref
-          zypper -n in ${{ matrix.pkgs }} cmake git go gtest pcre2-devel pkgconfig \
-            'pkgconfig(libbrotlicommon)' 'pkgconfig(liblz4)' \
-            'pkgconfig(libunwind-generic)' \
-            'pkgconfig(libzstd)' 'pkgconfig(protobuf)' ninja tar xz zlib-devel
+          zypper -n in ${{ matrix.pkgs }} cmake meson tar
 
       - name: prep archlinux
         if: startsWith(matrix.os, 'archlinux')
         run: |
           pacman -Syu --needed --noconfirm \
-            ${{ matrix.pkgs }} brotli cmake git go gtest libunwind \
-            lz4 pcre2 pkgconfig protobuf zstd ninja
+            ${{ matrix.pkgs }} cmake meson
 
       - name: prep ubuntu
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           apt-get update
           DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-            ${{ matrix.pkgs }} cmake git golang libbrotli-dev \
-            libgtest-dev liblz4-dev libpcre2-dev libprotobuf-dev libunwind-dev \
-            libzstd-dev pkg-config protobuf-compiler ninja-build xz-utils
+            ${{ matrix.pkgs }} cmake meson
 
       - name: prep alpine
         if: startsWith(matrix.os, 'alpine')
         run: |
-          apk add build-base pcre2-dev linux-headers gtest-dev samurai \
-          go git perl cmake protobuf-dev brotli-dev zstd-dev lz4-dev
+          apk add build-base meson cmake linux-headers
 
       - name: prep fedora
         if: startsWith(matrix.os, 'fedora')
+        # libatomic is needed because of https://github.com/mesonbuild/meson/issues/14946
         run: |
-          dnf install -y ${{ matrix.pkgs }} cmake ninja-build perl git golang \
-          brotli-devel gtest-devel lz4-devel pcre2-devel protobuf-devel \
-          libzstd-devel tar xz
+          dnf install -y ${{ matrix.pkgs }} cmake meson libatomic
 
       - name: download source
         uses: actions/download-artifact@v4
@@ -138,31 +133,23 @@ jobs:
 
       - name: build & install
         run: |
-          export GOFLAGS="-mod=vendor"
-          tar -xf android-tools-*.tar.xz
+          tar -xf android-tools-*.tar
           cd android-tools-*/
           test -n "${{ matrix.env1 }}" && export ${{ matrix.env1 }}
           test -n "${{ matrix.env2 }}" && export ${{ matrix.env2 }}
-          mkdir build && cd build
-          cmake \
-            -DCMAKE_C_FLAGS="$CFLAGS" \
-            -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DANDROID_TOOLS_USE_BUNDLED_FMT=ON \
-            -DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON \
-            -GNinja \
-            ..
-          ninja --verbose
-          echo -e "\n### make install ###\n"
-          cmake --install . --prefix /usr/local
+          meson setup build -Duse_bundled_libusb=true \
+            --native-file nativefiles/release_configuration.ini \
+            --prefix /usr/local
+          echo -e "\n### install ###\n"
+          meson install -C build
           echo -e "\n### all done ###\n"
 
       - name: check
         run: |
           /usr/local/bin/adb --version
           /usr/local/bin/fastboot --version
-          /usr/local/bin/make_f2fs -V
-          /usr/local/bin/sload_f2fs -V
+          # /usr/local/bin/make_f2fs -V
+          # /usr/local/bin/sload_f2fs -V
 
   macos:
     strategy:
@@ -182,8 +169,7 @@ jobs:
       - name: prep macos
         run: |
           rm -rf /opt/homebrew/include/openssl /usr/local/opt/openssl /usr/local/include/openssl
-          brew install --overwrite --quiet brotli cmake go googletest lz4 \
-          ninja pcre2 protobuf zstd
+          brew install --overwrite --quiet meson
 
       - name: download source
         uses: actions/download-artifact@v4
@@ -192,26 +178,59 @@ jobs:
 
       - name: build & install
         run: |
-          tar -xf android-tools-*.tar.xz
+          tar -xf android-tools-*.tar
           cd android-tools-*/
-          mkdir build && cd build
-          cmake \
-            -DCMAKE_C_FLAGS="$CFLAGS" \
-            -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=$HOME/android-tools \
-            -DANDROID_TOOLS_USE_BUNDLED_FMT=ON \
-            -DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON \
-            -GNinja \
-            ..
-          ninja --verbose
-          echo -e "\n### make install ###\n"
-          cmake --install .
+          meson setup build -Duse_bundled_libusb=true \
+            --native-file nativefiles/release_configuration.ini \
+            --prefix "$HOME/android-tools"
+          echo -e "\n### install ###\n"
+          meson install -C build
           echo -e "\n### all done ###\n"
 
       - name: check
         run: |
           $HOME/android-tools/bin/adb --version
           $HOME/android-tools/bin/fastboot --version
-          $HOME/android-tools/bin/make_f2fs -V
-          $HOME/android-tools/bin/sload_f2fs -V
+          # $HOME/android-tools/bin/make_f2fs -V
+          # $HOME/android-tools/bin/sload_f2fs -V
+
+  windows:
+    runs-on: windows-2022
+    needs: [upload-src]
+    steps:
+      - name: prep MSYS2
+        uses: msys2/[email protected]
+        with:
+          msystem: UCRT64
+          install: >
+            mingw-w64-ucrt-x86_64-meson
+            mingw-w64-ucrt-x86_64-gcc
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-nasm
+
+      - name: download source
+        uses: actions/download-artifact@v4
+        with:
+          name: package_source
+      - name: extract source
+        timeout-minutes: 10
+        run: tar -oxf android-tools-source.tar
+
+      - name: build & install
+        shell: msys2 {0}
+        run: |
+          cd android-tools-*/
+          meson setup build -Duse_bundled_libusb=true \
+            --native-file nativefiles/release_configuration.ini \
+            --native-file nativefiles/release_configuration_fullstatic.ini \
+            --native-file nativefiles/release_configuration_standardlayout.ini
+          echo -e "\n### install ###\n"
+          meson install -C build --destdir "$PWD/../android-tools"
+          echo -e "\n### all done ###\n"
+
+      - name: check
+        run: |
+          .\android-tools\adb.exe --version
+          .\android-tools\fastboot.exe --version
+          # .\android-tools\make_f2fs.exe -V
+          # .\android-tools\sload_f2fs.exe -V