Skip to content

Commit f94b8ee

Browse files
jwinarskejwinarske
authored
Merge pull request #16 from meta-flutter/jw/mono-repo
Mono Repo support
2 parents b210b94 + dc6fdb9 commit f94b8ee

File tree

4 files changed

+97
-79
lines changed

4 files changed

+97
-79
lines changed

‎.github/workflows/flutter-engine-arm64.yaml

+29-24
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,27 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
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}}]'
45+
git clone https://github.com/flutter/flutter.git
46+
pushd flutter
47+
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":""}]'
4648
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
47-
48-
PATCH_DIR=$PWD/patches
49+
popd
4950
5051
# fetch sysroot
51-
cd src
52+
cd flutter/engine/src
5253
build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
5354
55+
- name: Patch Flutter Source
56+
run: |
57+
PATCH_DIR=$PWD/patches
58+
cd flutter
5459
git apply $PATCH_DIR/0001-clang-toolchain.patch
5560
5661
- name: Build Debug
57-
working-directory: src
62+
working-directory: flutter/engine/src
5863
run: |
59-
export PATH=$PATH:$PWD/../depot_tools
60-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
64+
export PATH=$PATH:$PWD/../../../depot_tools
65+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
6166
CLANG_ROOT=$(find -iname clang++)
6267
CLANG_ROOT=$(dirname $CLANG_ROOT)
6368
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -76,9 +81,9 @@ jobs:
7681
7782
- name: Prepare Debug Artifacts
7883
run: |
79-
scripts/prepare-sdk-$arch.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
84+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
8085
81-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
86+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
8287
8388
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8489
@@ -103,10 +108,10 @@ jobs:
103108
gh release edit "$tag_debug" --draft=false
104109
105110
- name: Build Debug Unoptimized
106-
working-directory: src
111+
working-directory: flutter/engine/src
107112
run: |
108-
export PATH=$PATH:$PWD/../depot_tools
109-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
113+
export PATH=$PATH:$PWD/../../../depot_tools
114+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
110115
CLANG_ROOT=$(find -iname clang++)
111116
CLANG_ROOT=$(dirname $CLANG_ROOT)
112117
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -126,9 +131,9 @@ jobs:
126131
127132
- name: Prepare Debug Unoptimized Artifacts
128133
run: |
129-
scripts/prepare-sdk-$arch.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
134+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
130135
131-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
136+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
132137
133138
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
134139
@@ -153,10 +158,10 @@ jobs:
153158
gh release edit "$tag_debug_unopt" --draft=false
154159
155160
- name: Build Release
156-
working-directory: src
161+
working-directory: flutter/engine/src
157162
run: |
158-
export PATH=$PATH:$PWD/../depot_tools
159-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
163+
export PATH=$PATH:$PWD/../../../depot_tools
164+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
160165
CLANG_ROOT=$(find -iname clang++)
161166
CLANG_ROOT=$(dirname $CLANG_ROOT)
162167
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -175,9 +180,9 @@ jobs:
175180
176181
- name: Prepare Release Artifacts
177182
run: |
178-
scripts/prepare-sdk-$arch.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
183+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
179184
180-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
185+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
181186
182187
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
183188
@@ -202,10 +207,10 @@ jobs:
202207
gh release edit "$tag_release" --draft=false
203208
204209
- name: Build Profile
205-
working-directory: src
210+
working-directory: flutter/engine/src
206211
run: |
207-
export PATH=$PATH:$PWD/../depot_tools
208-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
212+
export PATH=$PATH:$PWD/../../../depot_tools
213+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
209214
CLANG_ROOT=$(find -iname clang++)
210215
CLANG_ROOT=$(dirname $CLANG_ROOT)
211216
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -224,9 +229,9 @@ jobs:
224229
225230
- name: Prepare Profile Artifacts
226231
run: |
227-
scripts/prepare-sdk-$arch.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
232+
scripts/prepare-sdk-$arch.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
228233
229-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
234+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
230235
231236
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
232237

‎.github/workflows/flutter-engine-armv7hf.yaml

+29-24
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,27 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
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}}]'
45+
git clone https://github.com/flutter/flutter.git
46+
pushd flutter
47+
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":""}]'
4648
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
47-
48-
PATCH_DIR=$PWD/patches
49+
popd
4950
5051
# fetch sysroot
51-
cd src
52+
cd flutter/engine/src
5253
build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
5354
55+
- name: Patch Flutter Source
56+
run: |
57+
PATCH_DIR=$PWD/patches
58+
cd flutter
5459
git apply $PATCH_DIR/0001-clang-toolchain.patch
5560
5661
- name: Build Debug
57-
working-directory: src
62+
working-directory: flutter/engine/src
5863
run: |
59-
export PATH=$PATH:$PWD/../depot_tools
60-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
64+
export PATH=$PATH:$PWD/../../../depot_tools
65+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
6166
CLANG_ROOT=$(find -iname clang++)
6267
CLANG_ROOT=$(dirname $CLANG_ROOT)
6368
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -77,9 +82,9 @@ jobs:
7782
7883
- name: Prepare Debug Artifacts
7984
run: |
80-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
85+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
8186
82-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
87+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
8388
8489
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8590
@@ -104,10 +109,10 @@ jobs:
104109
gh release edit "$tag_debug" --draft=false
105110
106111
- name: Build Debug Unoptimized
107-
working-directory: src
112+
working-directory: flutter/engine/src
108113
run: |
109-
export PATH=$PATH:$PWD/../depot_tools
110-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
114+
export PATH=$PATH:$PWD/../../../depot_tools
115+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
111116
CLANG_ROOT=$(find -iname clang++)
112117
CLANG_ROOT=$(dirname $CLANG_ROOT)
113118
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -127,9 +132,9 @@ jobs:
127132
128133
- name: Prepare Debug Unoptimized Artifacts
129134
run: |
130-
scripts/prepare-sdk-armv7hf.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
135+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
131136
132-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
137+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
133138
134139
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
135140
@@ -154,10 +159,10 @@ jobs:
154159
gh release edit "$tag_debug_unopt" --draft=false
155160
156161
- name: Build Release
157-
working-directory: src
162+
working-directory: flutter/engine/src
158163
run: |
159-
export PATH=$PATH:$PWD/../depot_tools
160-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
164+
export PATH=$PATH:$PWD/../../../depot_tools
165+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
161166
CLANG_ROOT=$(find -iname clang++)
162167
CLANG_ROOT=$(dirname $CLANG_ROOT)
163168
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -177,9 +182,9 @@ jobs:
177182
178183
- name: Prepare Release Artifacts
179184
run: |
180-
scripts/prepare-sdk-armv7hf.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
185+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
181186
182-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
187+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
183188
184189
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
185190
@@ -204,10 +209,10 @@ jobs:
204209
gh release edit "$tag_release" --draft=false
205210
206211
- name: Build Profile
207-
working-directory: src
212+
working-directory: flutter/engine/src
208213
run: |
209-
export PATH=$PATH:$PWD/../depot_tools
210-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
214+
export PATH=$PATH:$PWD/../../../depot_tools
215+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
211216
CLANG_ROOT=$(find -iname clang++)
212217
CLANG_ROOT=$(dirname $CLANG_ROOT)
213218
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -226,9 +231,9 @@ jobs:
226231
227232
- name: Prepare Profile Artifacts
228233
run: |
229-
scripts/prepare-sdk-armv7hf.sh src/out/linux_profile_$arch $PWD/src/build/linux/debian_sid_arm-sysroot
234+
scripts/prepare-sdk-armv7hf.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/debian_sid_arm-sysroot
230235
231-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
236+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
232237
233238
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
234239

‎.github/workflows/flutter-engine-x86_64.yaml

+32-24
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,27 @@ jobs:
4242
run: |
4343
export PATH=$PATH:$PWD/depot_tools
4444
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
45-
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}}]'
46-
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.srcrev }} -j$(nproc) -v
45+
git clone https://github.com/flutter/flutter.git
46+
pushd flutter
47+
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":""}]'
48+
gclient sync --force --shallow --no-history -R -D --revision ${{ inputs.SRCREV }} -j$(nproc) -v
49+
popd
4750
48-
PATCH_DIR=$PWD/patches
51+
# fetch sysroot
52+
cd flutter/engine/src
53+
build/linux/sysroot_scripts/install-sysroot.py --arch=$arch
4954
50-
cd src
55+
- name: Patch Flutter Source
56+
run: |
57+
PATCH_DIR=$PWD/patches
58+
cd flutter
5159
git apply $PATCH_DIR/0001-clang-toolchain.patch
5260
5361
- name: Build Debug
54-
working-directory: src
62+
working-directory: flutter/engine/src
5563
run: |
56-
export PATH=$PATH:$PWD/../depot_tools
57-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
64+
export PATH=$PATH:$PWD/../../../depot_tools
65+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
5866
CLANG_ROOT=$(find -iname clang++)
5967
CLANG_ROOT=$(dirname $CLANG_ROOT)
6068
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -73,9 +81,9 @@ jobs:
7381
7482
- name: Prepare Debug Artifacts
7583
run: |
76-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_$arch $PWD/src/build/linux/$target_sysroot
84+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
7785
78-
tar czfhv $tag_debug.tar.gz src/out/linux_debug_$arch/engine-sdk/
86+
tar czfhv $tag_debug.tar.gz flutter/engine/src/out/linux_debug_$arch/engine-sdk/
7987
8088
sha256sum -b $tag_debug.tar.gz > $tag_debug.tar.gz.sha256
8189
@@ -100,10 +108,10 @@ jobs:
100108
gh release edit "$tag_debug" --draft=false
101109
102110
- name: Build Debug Unoptimized
103-
working-directory: src
111+
working-directory: flutter/engine/src
104112
run: |
105-
export PATH=$PATH:$PWD/../depot_tools
106-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
113+
export PATH=$PATH:$PWD/../../../depot_tools
114+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
107115
CLANG_ROOT=$(find -iname clang++)
108116
CLANG_ROOT=$(dirname $CLANG_ROOT)
109117
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -123,9 +131,9 @@ jobs:
123131
124132
- name: Prepare Debug Unoptimized Artifacts
125133
run: |
126-
scripts/prepare-sdk-x86-64.sh src/out/linux_debug_unopt_$arch $PWD/src/build/linux/$target_sysroot
134+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_debug_unopt_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
127135
128-
tar czfhv $tag_debug_unopt.tar.gz src/out/linux_debug_unopt_$arch/engine-sdk/
136+
tar czfhv $tag_debug_unopt.tar.gz flutter/engine/src/out/linux_debug_unopt_$arch/engine-sdk/
129137
130138
sha256sum -b $tag_debug_unopt.tar.gz > $tag_debug_unopt.tar.gz.sha256
131139
@@ -150,10 +158,10 @@ jobs:
150158
gh release edit "$tag_debug_unopt" --draft=false
151159
152160
- name: Build Release
153-
working-directory: src
161+
working-directory: flutter/engine/src
154162
run: |
155-
export PATH=$PATH:$PWD/../depot_tools
156-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
163+
export PATH=$PATH:$PWD/../../../depot_tools
164+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
157165
CLANG_ROOT=$(find -iname clang++)
158166
CLANG_ROOT=$(dirname $CLANG_ROOT)
159167
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -172,9 +180,9 @@ jobs:
172180
173181
- name: Prepare Release Artifacts
174182
run: |
175-
scripts/prepare-sdk-x86-64.sh src/out/linux_release_$arch $PWD/src/build/linux/$target_sysroot
183+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_release_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
176184
177-
tar czfhv $tag_release.tar.gz src/out/linux_release_$arch/engine-sdk/
185+
tar czfhv $tag_release.tar.gz flutter/engine/src/out/linux_release_$arch/engine-sdk/
178186
179187
sha256sum -b $tag_release.tar.gz > $tag_release.tar.gz.sha256
180188
@@ -199,10 +207,10 @@ jobs:
199207
gh release edit "$tag_release" --draft=false
200208
201209
- name: Build Profile
202-
working-directory: src
210+
working-directory: flutter/engine/src
203211
run: |
204-
export PATH=$PATH:$PWD/../depot_tools
205-
export VPYTHON_VIRTUALENV_ROOT=$PWD/vpython
212+
export PATH=$PATH:$PWD/../../../depot_tools
213+
export VPYTHON_VIRTUALENV_ROOT=$PWD/../../../vpython
206214
CLANG_ROOT=$(find -iname clang++)
207215
CLANG_ROOT=$(dirname $CLANG_ROOT)
208216
export CLANG_ROOT=$(dirname $CLANG_ROOT)
@@ -221,9 +229,9 @@ jobs:
221229
222230
- name: Prepare Profile Artifacts
223231
run: |
224-
scripts/prepare-sdk-x86-64.sh src/out/linux_profile_$arch $PWD/src/build/linux/$target_sysroot
232+
scripts/prepare-sdk-x86-64.sh flutter/engine/src/out/linux_profile_$arch $PWD/flutter/engine/src/build/linux/$target_sysroot
225233
226-
tar czfhv $tag_profile.tar.gz src/out/linux_profile_$arch/engine-sdk/
234+
tar czfhv $tag_profile.tar.gz flutter/engine/src/out/linux_profile_$arch/engine-sdk/
227235
228236
sha256sum -b $tag_profile.tar.gz > $tag_profile.tar.gz.sha256
229237

‎patches/0001-clang-toolchain.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From eb564c8be13a16158056890069deef5bad533529 Mon Sep 17 00:00:00 2001
1+
From 5e4bf78183f9bf30d093b3e766f36a5780f068ab Mon Sep 17 00:00:00 2001
22
From: Joel Winarske <[email protected]>
3-
Date: Mon, 26 Aug 2024 12:25:58 -0700
3+
Date: Thu, 13 Feb 2025 12:44:11 -0800
44
Subject: [PATCH] clang toolchain
55

66
Signed-off-by: Joel Winarske <[email protected]>
77
---
8-
build/toolchain/custom/BUILD.gn | 8 ++++----
8+
engine/src/build/toolchain/custom/BUILD.gn | 8 ++++----
99
1 file changed, 4 insertions(+), 4 deletions(-)
1010

11-
diff --git a/build/toolchain/custom/BUILD.gn b/build/toolchain/custom/BUILD.gn
12-
index 3da5f93..05de4d7 100644
13-
--- a/build/toolchain/custom/BUILD.gn
14-
+++ b/build/toolchain/custom/BUILD.gn
11+
diff --git a/engine/src/build/toolchain/custom/BUILD.gn b/engine/src/build/toolchain/custom/BUILD.gn
12+
index 3da5f93026..05de4d7e3c 100644
13+
--- a/engine/src/build/toolchain/custom/BUILD.gn
14+
+++ b/engine/src/build/toolchain/custom/BUILD.gn
1515
@@ -12,11 +12,11 @@ toolchain("custom") {
1616
# these values in our scope.
1717
cc = "${toolchain_bin}/clang"

0 commit comments

Comments
 (0)