Skip to content

Commit b48ccca

Browse files
authored
Merge pull request #17 from meta-flutter/jw/mono-package
Mono SDK packaging
2 parents f94b8ee + d2abeaa commit b48ccca

6 files changed

+118
-9
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
--enable-impeller-3d \
7373
--no-goma --no-rbe \
7474
--no-stripped --no-enable-unittests \
75+
--no-dart-version-git-info \
7576
--linux-cpu $linux_cpu \
7677
--target-os linux \
7778
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -122,6 +123,7 @@ jobs:
122123
--enable-impeller-3d \
123124
--no-goma --no-rbe \
124125
--no-stripped --no-enable-unittests \
126+
--no-dart-version-git-info \
125127
--linux-cpu $linux_cpu \
126128
--target-os linux \
127129
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -171,6 +173,7 @@ jobs:
171173
--enable-impeller-3d \
172174
--no-goma --no-rbe \
173175
--no-stripped --no-enable-unittests \
176+
--no-dart-version-git-info \
174177
--linux-cpu $linux_cpu \
175178
--target-os linux \
176179
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -220,6 +223,7 @@ jobs:
220223
--enable-impeller-3d \
221224
--no-goma --no-rbe \
222225
--no-stripped --no-enable-unittests \
226+
--no-dart-version-git-info \
223227
--linux-cpu $linux_cpu \
224228
--target-os linux \
225229
--target-sysroot $PWD/build/linux/$target_sysroot \

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

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
--enable-impeller-3d \
7373
--no-goma --no-rbe \
7474
--no-stripped --no-enable-unittests \
75+
--no-dart-version-git-info \
7576
--linux-cpu $linux_cpu \
7677
--target-os linux \
7778
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -123,6 +124,7 @@ jobs:
123124
--enable-impeller-3d \
124125
--no-goma --no-rbe \
125126
--no-stripped --no-enable-unittests \
127+
--no-dart-version-git-info \
126128
--linux-cpu $linux_cpu \
127129
--target-os linux \
128130
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -172,6 +174,7 @@ jobs:
172174
--enable-impeller-3d \
173175
--no-goma --no-rbe \
174176
--no-stripped --no-enable-unittests \
177+
--no-dart-version-git-info \
175178
--linux-cpu $linux_cpu \
176179
--target-os linux \
177180
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -222,6 +225,7 @@ jobs:
222225
--enable-impeller-3d \
223226
--no-goma --no-rbe \
224227
--no-stripped --no-enable-unittests \
228+
--no-dart-version-git-info \
225229
--linux-cpu $linux_cpu \
226230
--target-os linux \
227231
--target-sysroot $PWD/build/linux/$target_sysroot \

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

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
--enable-impeller-3d \
7373
--no-goma --no-rbe \
7474
--no-stripped --no-enable-unittests \
75+
--no-dart-version-git-info \
7576
--linux-cpu $linux_cpu \
7677
--target-os linux \
7778
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -122,6 +123,7 @@ jobs:
122123
--enable-impeller-3d \
123124
--no-goma --no-rbe \
124125
--no-stripped --no-enable-unittests \
126+
--no-dart-version-git-info \
125127
--linux-cpu $linux_cpu \
126128
--target-os linux \
127129
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -171,6 +173,7 @@ jobs:
171173
--enable-impeller-3d \
172174
--no-goma --no-rbe \
173175
--no-stripped --no-enable-unittests \
176+
--no-dart-version-git-info \
174177
--linux-cpu $linux_cpu \
175178
--target-os linux \
176179
--target-sysroot $PWD/build/linux/$target_sysroot \
@@ -220,6 +223,7 @@ jobs:
220223
--enable-impeller-3d \
221224
--no-goma --no-rbe \
222225
--no-stripped --no-enable-unittests \
226+
--no-dart-version-git-info \
223227
--linux-cpu $linux_cpu \
224228
--target-os linux \
225229
--target-sysroot $PWD/build/linux/$target_sysroot \

scripts/prepare-sdk-arm64.sh

+36-3
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,54 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64}
99
#
1010
# Include
1111
#
12-
cp flutter_embedder.h engine-sdk/include/
12+
cp *.h engine-sdk/include/
1313

1414
#
1515
# /data
1616
#
1717
cp icudtl.dat engine-sdk/data/
1818

19+
#
20+
# cpp_client_wrapper_glfw
21+
#
22+
if [ -e cpp_client_wrapper_glfw ]; then
23+
mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/
24+
cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/
25+
fi
26+
1927
#
20-
# SDK
28+
# flutter_linux
2129
#
22-
cp -r flutter_patched_sdk engine-sdk/sdk/
30+
if [ -e flutter_linux ]; then
31+
mkdir -p engine-sdk/include/flutter_linux
32+
cp -r flutter_linux/* engine-sdk/include/flutter_linux/
33+
fi
34+
35+
#
36+
# flutter_patched_sdk
37+
#
38+
if [ -e flutter_patched_sdk ]; then
39+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
40+
cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/
41+
fi
42+
43+
#
44+
# shader_lib
45+
#
2346
if [ -e shader_lib ]; then
47+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
2448
cp -r shader_lib engine-sdk/
2549
fi
2650

51+
#
52+
# zip archives
53+
#
54+
if [ -e zip_archives ]; then
55+
mkdir -p engine-sdk/sdk/zip_archives
56+
cp -r zip_archives/* engine-sdk/sdk/zip_archives/
57+
fi
58+
59+
2760
export cwd=$(pwd)
2861

2962
#

scripts/prepare-sdk-armv7hf.sh

+35-3
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,53 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64}
99
#
1010
# Include
1111
#
12-
cp flutter_embedder.h engine-sdk/include/
12+
cp *.h engine-sdk/include/
1313

1414
#
1515
# /data
1616
#
1717
cp icudtl.dat engine-sdk/data/
1818

19+
#
20+
# cpp_client_wrapper_glfw
21+
#
22+
if [ -e cpp_client_wrapper_glfw ]; then
23+
mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/
24+
cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/
25+
fi
26+
1927
#
20-
# SDK
28+
# flutter_linux
2129
#
22-
cp -r flutter_patched_sdk engine-sdk/sdk/
30+
if [ -e flutter_linux ]; then
31+
mkdir -p engine-sdk/include/flutter_linux
32+
cp -r flutter_linux/* engine-sdk/include/flutter_linux/
33+
fi
34+
35+
#
36+
# flutter_patched_sdk
37+
#
38+
if [ -e flutter_patched_sdk ]; then
39+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
40+
cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/
41+
fi
42+
43+
#
44+
# shader_lib
45+
#
2346
if [ -e shader_lib ]; then
47+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
2448
cp -r shader_lib engine-sdk/
2549
fi
2650

51+
#
52+
# zip archives
53+
#
54+
if [ -e zip_archives ]; then
55+
mkdir -p engine-sdk/sdk/zip_archives
56+
cp -r zip_archives/* engine-sdk/sdk/zip_archives/
57+
fi
58+
2759
export cwd=$(pwd)
2860

2961
#

scripts/prepare-sdk-x86-64.sh

+35-3
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,53 @@ mkdir -p engine-sdk/{bin,include,lib,data,clang_x64/bin,clang_x64/lib64}
99
#
1010
# Include
1111
#
12-
cp flutter_embedder.h engine-sdk/include/
12+
cp *.h engine-sdk/include/
1313

1414
#
1515
# /data
1616
#
1717
cp icudtl.dat engine-sdk/data/
1818

19+
#
20+
# cpp_client_wrapper_glfw
21+
#
22+
if [ -e cpp_client_wrapper_glfw ]; then
23+
mkdir -p engine-sdk/sdk/cpp_client_wrapper_glfw/
24+
cp -r cpp_client_wrapper_glfw/* engine-sdk/sdk/cpp_client_wrapper_glfw/
25+
fi
26+
1927
#
20-
# SDK
28+
# flutter_linux
2129
#
22-
cp -r flutter_patched_sdk engine-sdk/sdk/
30+
if [ -e flutter_linux ]; then
31+
mkdir -p engine-sdk/include/flutter_linux
32+
cp -r flutter_linux/* engine-sdk/include/flutter_linux/
33+
fi
34+
35+
#
36+
# flutter_patched_sdk
37+
#
38+
if [ -e flutter_patched_sdk ]; then
39+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
40+
cp -r flutter_patched_sdk/* engine-sdk/sdk/flutter_patched_sdk/
41+
fi
42+
43+
#
44+
# shader_lib
45+
#
2346
if [ -e shader_lib ]; then
47+
mkdir -p engine-sdk/sdk/flutter_patched_sdk
2448
cp -r shader_lib engine-sdk/
2549
fi
2650

51+
#
52+
# zip archives
53+
#
54+
if [ -e zip_archives ]; then
55+
mkdir -p engine-sdk/sdk/zip_archives
56+
cp -r zip_archives/* engine-sdk/sdk/zip_archives/
57+
fi
58+
2759
export cwd=$(pwd)
2860

2961
#

0 commit comments

Comments
 (0)