Skip to content

Commit e45fefe

Browse files
swift-kimGitHub Enterprise
swift-kim
authored and
GitHub Enterprise
committed
Support x86 build (#18)
* Support x86 build * Update DEPS file * Update CI configuration to support x86 build
1 parent 075d0a7 commit e45fefe

File tree

3 files changed

+49
-52
lines changed

3 files changed

+49
-52
lines changed

‎.circleci/config.yml

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,50 @@
11
version: 2
22
jobs:
3-
build_tizen_arm:
3+
build_tizen:
44
working_directory: /home/circleci/engine/src
55
docker:
66
- image: art.sec.samsung.net/f-project_docker/engine_build_docker/flutter_engine:latest
77
environment:
88
ART_REPO_NAME: f-project_generic/engine
9-
ART_DEPLOY_PATH: flutter/tizen/arm
9+
ART_DEPLOY_PATH: flutter/tizen
1010
ART_USERNAME: mh.byun
1111
ART_APIKEY: AKCp5fTttyfJ82EJXUkbjqpoBRZGh2ovZFD9DDZAhBYn1h26Jrbxm3mnrE1egphaaAUyNTrWq
1212
no_proxy: 10.252.240.232,10.113.164.251,10.113.164.242
1313
steps:
1414
- run: curl -sL https://art.sec.samsung.net/artifactory/tools/CircleCI/scripts/set_proxy_setting.sh | sh
1515
- checkout:
1616
path: /home/circleci/engine/src/flutter
17-
- run: gclient sync -D
18-
- run: ./flutter/tools/gn --unopt --target-os linux --linux-cpu arm --target-toolchain /home/circleci/engine/src/third_party/tizen_tools/toolchains --target-sysroot /home/circleci/engine/src/third_party/tizen_tools/sysroot/armel --target-triple armv7l-tizen-linux-gnueabi --runtime-mode debug --embedder-for-target --build-tizen-shell
19-
- run: ninja -C out/linux_debug_unopt_arm/
20-
17+
- run: gclient sync -D
18+
- run: sed -i 's/"-Wno-non-c-typedef-for-linkage",//g' build/config/compiler/BUILD.gn
19+
20+
- run: ./flutter/tools/gn --target-os linux --linux-cpu arm --target-toolchain `pwd`/third_party/tizen_tools/toolchains --target-sysroot `pwd`/third_party/tizen_tools/sysroot/arm --target-triple armv7l-tizen-linux-gnueabi --runtime-mode debug --embedder-for-target --build-tizen-shell
21+
- run: ninja -C out/linux_debug_arm
2122
- store_artifacts:
22-
path: /home/circleci/engine/src/out/linux_debug_unopt_arm/libflutter_linux_tizen.so
23-
- run: ./flutter/tools/gn --unopt --target-os linux --linux-cpu arm --target-toolchain /home/circleci/engine/src/third_party/tizen_tools/toolchains --target-sysroot /home/circleci/engine/src/third_party/tizen_tools/sysroot/armel --target-triple armv7l-tizen-linux-gnueabi --runtime-mode release --embedder-for-target --build-tizen-shell
24-
- run: ninja -C out/linux_release_unopt_arm/
23+
path: /home/circleci/engine/src/out/linux_debug_arm/libflutter_linux_tizen.so
24+
25+
- run: ./flutter/tools/gn --target-os linux --linux-cpu arm --target-toolchain `pwd`/third_party/tizen_tools/toolchains --target-sysroot `pwd`/third_party/tizen_tools/sysroot/arm --target-triple armv7l-tizen-linux-gnueabi --runtime-mode release --embedder-for-target --build-tizen-shell
26+
- run: ninja -C out/linux_release_arm
2527
- store_artifacts:
26-
path: /home/circleci/engine/src/out/linux_release_unopt_arm/libflutter_linux_tizen.so
28+
path: /home/circleci/engine/src/out/linux_release_arm/libflutter_linux_tizen.so
29+
30+
- run: ./flutter/tools/gn --target-os linux --linux-cpu x86 --target-toolchain `pwd`/third_party/tizen_tools/toolchains --target-sysroot `pwd`/third_party/tizen_tools/sysroot/x86 --target-triple i586-tizen-linux-gnueabi --runtime-mode debug --embedder-for-target --build-tizen-shell
31+
- run: ninja -C out/linux_debug_x86
32+
- store_artifacts:
33+
path: /home/circleci/engine/src/out/linux_debug_x86/libflutter_linux_tizen.so
34+
2735
# - run: curl -XGET https://art.sec.samsung.net/artifactory/tools/art/jfrog -L -k > /home/circleci/engine/src/jfrog && chmod u+x /home/circleci/engine/src/jfrog
2836
# - run:
2937
# name: Push so to artifactory
3038
# command: |-
3139
# /home/circleci/engine/src/jfrog rt config --url https://art.sec.samsung.net/artifactory --user ${ART_USERNAME} --password ${ART_APIKEY} --interactive=false
32-
# cd /home/circleci/engine/src/out/linux_debug_unopt_arm
40+
# cd /home/circleci/engine/src/out/linux_debug_arm
3341
# /home/circleci/engine/src/jfrog rt u ./libflutter_linux_tizen.so ${ART_REPO_NAME}/${ART_DEPLOY_PATH}/debug/ --build-name=${CIRCLE_REPOSITORY_URL} --build-number=${CIRCLE_SHA1} --flat=false
34-
# cd /home/circleci/engine/src/out/linux_release_unopt_arm
42+
# cd /home/circleci/engine/src/out/linux_release_arm
3543
# /home/circleci/engine/src/jfrog rt u ./libflutter_linux_tizen.so ${ART_REPO_NAME}/${ART_DEPLOY_PATH}/release/ --build-name=${CIRCLE_REPOSITORY_URL} --build-number=${CIRCLE_SHA1} --flat=false
3644
# /home/circleci/engine/src/jfrog rt bag ${CIRCLE_REPOSITORY_URL} ${CIRCLE_SHA1} $(eval "echo ${CIRCLE_WORKING_DIRECTORY}")
3745
# /home/circleci/engine/src/jfrog rt bp ${CIRCLE_REPOSITORY_URL} ${CIRCLE_SHA1}
3846
workflows:
3947
version: 2
4048
build_All:
4149
jobs:
42-
- build_tizen_arm
50+
- build_tizen

‎DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ allowed_hosts = [
106106

107107
deps = {
108108
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a6c0959d1ac8cdfe6f9ff87892bc4905a73699fe',
109-
'src/third_party/tizen_tools' :'[email protected]:f-project/tizen_tools.git' + '@' + 'dcd6fbaaa68da4225ab1482e60e6e6ee157664b6',
109+
'src/third_party/tizen_tools' :'[email protected]:f-project/tizen_tools.git' + '@' + '132783e77ce422a3b26f5369c5c85382cad1808e',
110110

111111
# Fuchsia compatibility
112112
#

‎shell/platform/tizen/BUILD.gn

+27-38
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ config("relative_flutter_tizen_headers") {
1515

1616
config("flutter_tizen_native_headers") {
1717
include_dirs = [
18-
"//third_party/tizen_tools/sysroot/armel/usr/include",
19-
"//third_party/tizen_tools/sysroot/armel/usr/include/base",
20-
"//third_party/tizen_tools/sysroot/armel/usr/include/dlog",
21-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-1",
22-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-wl2-1",
23-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-evas-1",
24-
"//third_party/tizen_tools/sysroot/armel/usr/include/efl-1",
25-
"//third_party/tizen_tools/sysroot/armel/usr/include/eo-1",
26-
"//third_party/tizen_tools/sysroot/armel/usr/include/eina-1",
27-
"//third_party/tizen_tools/sysroot/armel/usr/include/eina-1/eina",
28-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-input-1",
29-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-imf-1",
30-
"//third_party/tizen_tools/sysroot/armel/usr/include/ecore-imf-evas-1",
31-
"//third_party/tizen_tools/sysroot/armel/usr/include/evas-1",
32-
"//third_party/tizen_tools/sysroot/armel/usr/include/emile-1",
18+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include",
19+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/base",
20+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/dlog",
21+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-1",
22+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-evas-1",
23+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-imf-1",
24+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-imf-evas-1",
25+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-input-1",
26+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/ecore-wl2-1",
27+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/efl-1",
28+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/eina-1",
29+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/eina-1/eina",
30+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/emile-1",
31+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/eo-1",
32+
"//third_party/tizen_tools/sysroot/$target_cpu/usr/include/evas-1",
3333
]
3434
}
3535

@@ -50,29 +50,18 @@ source_set("flutter_tizen_headers") {
5050

5151
source_set("flutter_tizen") {
5252
sources = [
53-
"tizen_event_loop.cc",
54-
"tizen_event_loop.h",
5553
"flutter_tizen.cc",
5654
"key_event_channel.cc",
57-
"key_event_channel.h",
55+
"lifecycle_channel.cc",
56+
"localization_channel.cc",
57+
"text_input_plugin.cc",
5858
"tizen_embedder_engine.cc",
59-
"tizen_embedder_engine.h",
59+
"tizen_event_loop.cc",
6060
"tizen_surface.cc",
61-
"tizen_surface.h",
6261
"tizen_surface_gl.cc",
63-
"tizen_surface_gl.h",
6462
"tizen_surface_software.cc",
65-
"tizen_surface_software.h",
6663
"tizen_vsync_waiter.cc",
67-
"tizen_vsync_waiter.h",
6864
"touch_event_channel.cc",
69-
"touch_event_channel.h",
70-
"text_input_plugin.h",
71-
"text_input_plugin.cc",
72-
"lifecycle_channel.h",
73-
"lifecycle_channel.cc",
74-
"localization_channel.h",
75-
"localization_channel.cc",
7665
]
7766

7867
defines = [ "USE_RAPID_JSON" ]
@@ -91,25 +80,25 @@ source_set("flutter_tizen") {
9180
"//third_party/rapidjson",
9281
]
9382

94-
lib_dirs = [ "//third_party/tizen_tools/sysroot/armel/usr/lib" ]
83+
lib_dirs = [ "//third_party/tizen_tools/sysroot/$target_cpu/usr/lib" ]
9584

9685
cflags_cc = [
9786
"-Wno-newline-eof",
9887
"-Wno-macro-redefined",
9988
"-Wno-unused-const-variable"
10089
]
10190
libs = [
91+
"base-utils-i18n",
10292
"dlog",
103-
"EGL",
104-
"ecore_wl2",
105-
"wayland-client",
106-
"GLESv2",
107-
"tdm-client",
10893
"ecore",
94+
"ecore_imf",
10995
"ecore_input",
96+
"ecore_wl2",
97+
"EGL",
11098
"evas",
111-
"ecore_imf",
112-
"base-utils-i18n"
99+
"GLESv2",
100+
"tdm-client",
101+
"wayland-client",
113102
]
114103
}
115104

0 commit comments

Comments
 (0)