Mono Repo support

-3.29.0+ Signed-off-by: Joel Winarske <[email protected]>
meta-flutter · Feb 13, 2025 · 5375c12 · 5375c12
1 parent b210b94
commit 5375c12
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 67 deletions.
diff --git a/.github/workflows/flutter-engine-arm64.yaml b/.github/workflows/flutter-engine-arm64.yaml
@@ -42,22 +42,25 @@ jobs:
         run: |
           export PATH=$PATH:$PWD/depot_tools
           export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
-          gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
+          git clone https://github.com/flutter/flutter.git
+          pushd flutter
+          gclient config --spec 'solutions=[{"managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
           gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
+          popd
 
           PATCH_DIR=$PWD/patches
 
           # fetch sysroot
-          cd src
+          cd flutter/engine/src
           build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
 
           git apply $PATCH_DIR/0001-clang-toolchain.patch
       
       - name: Build Debug
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -76,9 +79,9 @@ jobs:
 
       - name: Prepare Debug Artifacts
         run: |
-          scripts/prepare-sdk-$arch.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug.tar.gz              src/out/linux_debug_$arch/engine-sdk/
+          tar czfhv $tag_debug.tar.gz              flutter/engine/src/out/linux_debug_$arch/engine-sdk/
 
           sha256sum -b $tag_debug.tar.gz         > $tag_debug.tar.gz.sha256
 
@@ -103,10 +106,10 @@ jobs:
           gh release edit "$tag_debug" --draft=false
 
       - name: Build Debug Unoptimized
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -126,9 +129,9 @@ jobs:
 
       - name: Prepare Debug Unoptimized Artifacts
         run: |
-          scripts/prepare-sdk-$arch.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug_unopt.tar.gz              src/out/linux_debug_unopt_$arch/engine-sdk/
+          tar czfhv $tag_debug_unopt.tar.gz              flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
 
           sha256sum -b $tag_debug_unopt.tar.gz         > $tag_debug_unopt.tar.gz.sha256
 
@@ -153,10 +156,10 @@ jobs:
           gh release edit "$tag_debug_unopt" --draft=false
 
       - name: Build Release
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -175,9 +178,9 @@ jobs:
 
       - name: Prepare Release Artifacts
         run: |
-          scripts/prepare-sdk-$arch.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
+          tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
 
           sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
 
@@ -202,10 +205,10 @@ jobs:
           gh release edit "$tag_release" --draft=false
 
       - name: Build Profile
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -224,9 +227,9 @@ jobs:
 
       - name: Prepare Profile Artifacts
         run: |
-          scripts/prepare-sdk-$arch.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
+          tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
 
           sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
 

diff --git a/.github/workflows/flutter-engine-armv7hf.yaml b/.github/workflows/flutter-engine-armv7hf.yaml
@@ -42,22 +42,23 @@ jobs:
         run: |
           export PATH=$PATH:$PWD/depot_tools
           export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
-          gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
+          git clone https://github.com/flutter/flutter.git
+          gclient config --spec 'solutions=[{"path":"flutter","managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
           gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
 
           PATCH_DIR=$PWD/patches
 
           # fetch sysroot
-          cd src
+          cd flutter/engine/src
           build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
 
           git apply $PATCH_DIR/0001-clang-toolchain.patch
       
       - name: Build Debug
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -77,9 +78,9 @@ jobs:
 
       - name: Prepare Debug Artifacts
         run: |
-          scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug.tar.gz              src/out/linux_debug_$arch/engine-sdk/
+          tar czfhv $tag_debug.tar.gz              flutter/engine/src/out/linux_debug_$arch/engine-sdk/
 
           sha256sum -b $tag_debug.tar.gz         > $tag_debug.tar.gz.sha256
 
@@ -104,10 +105,10 @@ jobs:
           gh release edit "$tag_debug" --draft=false
 
       - name: Build Debug Unoptimized
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -127,9 +128,9 @@ jobs:
 
       - name: Prepare Debug Unoptimized Artifacts
         run: |
-          scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug_unopt.tar.gz              src/out/linux_debug_unopt_$arch/engine-sdk/
+          tar czfhv $tag_debug_unopt.tar.gz              flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
 
           sha256sum -b $tag_debug_unopt.tar.gz         > $tag_debug_unopt.tar.gz.sha256
 
@@ -154,10 +155,10 @@ jobs:
           gh release edit "$tag_debug_unopt" --draft=false
 
       - name: Build Release
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -177,9 +178,9 @@ jobs:
 
       - name: Prepare Release Artifacts
         run: |
-          scripts/prepare-sdk-armv7hf.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
+          tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
 
           sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
 
@@ -204,10 +205,10 @@ jobs:
           gh release edit "$tag_release" --draft=false
 
       - name: Build Profile
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -226,9 +227,9 @@ jobs:
 
       - name: Prepare Profile Artifacts
         run: |
-          scripts/prepare-sdk-armv7hf.sh src/out/linux_profile_$arch $PWD/src/build/linux/debian_sid_arm-sysroot
+          scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/debian_sid_arm-sysroot
 
-          tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
+          tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
 
           sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
 

diff --git a/.github/workflows/flutter-engine-x86_64.yaml b/.github/workflows/flutter-engine-x86_64.yaml
@@ -42,19 +42,20 @@ jobs:
         run: |
           export PATH=$PATH:$PWD/depot_tools
           export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
-          gclient config --spec 'solutions=[{"name":"src/flutter","url":"https://github.com/flutter/engine.git","deps_file":"DEPS","managed":False,"custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True}}]'
-          gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.srcrev }} -j$(nproc) -v
+          git clone https://github.com/flutter/flutter.git
+          gclient config --spec 'solutions=[{"path":"flutter","managed":False,"name":".","url":"https://github.com/flutter/flutter.git","custom_deps":{},"custom_vars":{"download_android_deps":False,"download_windows_deps":False,"download_linux_deps":True},"deps_file":"DEPS","safesync_url":""}]'
+          gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
 
           PATCH_DIR=$PWD/patches
 
-          cd src
+          cd flutter/engine/src
           git apply $PATCH_DIR/0001-clang-toolchain.patch
       
       - name: Build Debug
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -73,9 +74,9 @@ jobs:
 
       - name: Prepare Debug Artifacts
         run: |
-          scripts/prepare-sdk-x86-64.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug.tar.gz              src/out/linux_debug_$arch/engine-sdk/
+          tar czfhv $tag_debug.tar.gz              flutter/engine/src/out/linux_debug_$arch/engine-sdk/
 
           sha256sum -b $tag_debug.tar.gz         > $tag_debug.tar.gz.sha256
 
@@ -100,10 +101,10 @@ jobs:
           gh release edit "$tag_debug" --draft=false
 
       - name: Build Debug Unoptimized
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -123,9 +124,9 @@ jobs:
 
       - name: Prepare Debug Unoptimized Artifacts
         run: |
-          scripts/prepare-sdk-x86-64.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_debug_unopt.tar.gz              src/out/linux_debug_unopt_$arch/engine-sdk/
+          tar czfhv $tag_debug_unopt.tar.gz              flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
 
           sha256sum -b $tag_debug_unopt.tar.gz         > $tag_debug_unopt.tar.gz.sha256
 
@@ -150,10 +151,10 @@ jobs:
           gh release edit "$tag_debug_unopt" --draft=false
 
       - name: Build Release
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -172,9 +173,9 @@ jobs:
 
       - name: Prepare Release Artifacts
         run: |
-          scripts/prepare-sdk-x86-64.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
+          tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
 
           sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
 
@@ -199,10 +200,10 @@ jobs:
           gh release edit "$tag_release" --draft=false
 
       - name: Build Profile
-        working-directory: src
+        working-directory: flutter/engine/src
         run: |
-          export PATH=$PATH:$PWD/../depot_tools
-          export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
+          export PATH=$PATH:$PWD/../../../depot_tools
+          export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
           CLANG_ROOT=$(find -iname clang++)
           CLANG_ROOT=$(dirname $CLANG_ROOT)
           export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -221,9 +222,9 @@ jobs:
 
       - name: Prepare Profile Artifacts
         run: |
-          scripts/prepare-sdk-x86-64.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
+          scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
 
-          tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
+          tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
 
           sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256