summaryrefslogtreecommitdiffstats
path: root/meta-agl-flutter/tools/configs
diff options
context:
space:
mode:
authorJoel Winarske <joel.winarske@gmail.com>2023-10-17 10:35:36 -0700
committerScott Murray <scott.murray@konsulko.com>2023-10-18 16:33:26 -0400
commit15df7f399d57729b6583d24cecf0e9d7add75a03 (patch)
tree64102eeea404a326558d497dd7208328cc22b69f /meta-agl-flutter/tools/configs
parentd9670d5543f8a9444ab01d39ad8a95bc1aee3df3 (diff)
Flutter 3.13.2 update
-README update -workspace-automation configs * _global.json - move to 3.13.2 * _repos.json - remove wonderous, update commits, add depot_tools * flutter-engine.json - flutter engine local build (optional) * desktop-auto.json - remove clang from desktop-auto config -flutter-engine recipe * remove bbappend patches -flutter-auto * update agl-shell PACKAGECONFIG addition * remove patches upstream picked up 0001-shell-wayland-display-Handle-flags-as-bitfield-entri.patch dropped 0001-Add-optional-agl_shell-plugin.patch Bug-AGL: SPEC-4936 Signed-off-by: Joel Winarske <joel.winarske@gmail.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Iddd7c0f735abb4d114ba89a8bf0e49977b469150
Diffstat (limited to 'meta-agl-flutter/tools/configs')
-rw-r--r--meta-agl-flutter/tools/configs/_globals.json2
-rw-r--r--meta-agl-flutter/tools/configs/_repos.json24
-rw-r--r--meta-agl-flutter/tools/configs/desktop-auto.json74
-rw-r--r--meta-agl-flutter/tools/configs/flutter-engine.json101
4 files changed, 124 insertions, 77 deletions
diff --git a/meta-agl-flutter/tools/configs/_globals.json b/meta-agl-flutter/tools/configs/_globals.json
index 1800c6bf..35838b67 100644
--- a/meta-agl-flutter/tools/configs/_globals.json
+++ b/meta-agl-flutter/tools/configs/_globals.json
@@ -1,5 +1,5 @@
{
- "flutter-version": "3.3.7",
+ "flutter-version": "3.13.2",
"github_token": "",
"cookie_file": ""
} \ No newline at end of file
diff --git a/meta-agl-flutter/tools/configs/_repos.json b/meta-agl-flutter/tools/configs/_repos.json
index d1d42d42..e15bd123 100644
--- a/meta-agl-flutter/tools/configs/_repos.json
+++ b/meta-agl-flutter/tools/configs/_repos.json
@@ -1,6 +1,7 @@
[
{
"uri": "https://github.com/toyota-connected/ivi-homescreen.git",
+ "rev": "f42c61c5349ed4981767239f6ba052c315d89c3a",
"branch": "agl"
},
{
@@ -8,24 +9,15 @@
"branch": "main"
},
{
- "uri": "https://github.com/gskinnerTeam/flutter-wonderous-app.git",
- "branch": "main",
- "pubspec_path": "flutter-wonderous-app"
- },
- {
- "uri": "https://github.com/flutter/pinball.git",
- "branch": "main",
- "pubspec_path": "pinball"
- },
- {
"uri": "https://github.com/flutter/gallery.git",
"branch": "master",
- "rev": "9eb785cb997ff56c46e933c1c591f0a6f31454f6",
+ "rev": "22a07bf664a2128684ec245032c05b1c8f10048e",
"pubspec_path": "gallery"
},
{
"uri": "https://github.com/mogol/flutter_secure_storage.git",
"branch": "develop",
+ "rev": "3bb93366161a787b07c45d8ce98c7405b40fbf1f",
"pubspec_path": "flutter_secure_storage/flutter_secure_storage/example"
},
{
@@ -35,14 +27,12 @@
"pubspec_path": "flutter_animated_background/example"
},
{
- "uri": "https://github.com/felipeerias/flutter_homescreen.git",
- "branch": "main",
- "rev": "08bf271f7f1f14153a41005718a2090fa8e783f0",
- "pubspec_path": "flutter_homescreen"
- },
- {
"uri": "https://github.com/bernardpumped/ped.git",
"branch": "agl",
"pubspec_path": "ped"
+ },
+ {
+ "uri": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
+ "branch": "main"
}
]
diff --git a/meta-agl-flutter/tools/configs/desktop-auto.json b/meta-agl-flutter/tools/configs/desktop-auto.json
index 66cec712..cb3b9e68 100644
--- a/meta-agl-flutter/tools/configs/desktop-auto.json
+++ b/meta-agl-flutter/tools/configs/desktop-auto.json
@@ -11,13 +11,10 @@
"flutter_runtime": "debug",
"type": "host",
"env": {
- "FLUTTER_AUTO_SRC_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen",
- "FLUTTER_AUTO_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen/build",
- "FLUTTER_AUTO_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=Debug -DBUILD_PLUGIN_SECURE_STORAGE=ON",
- "COMP_SURF_PBR_SRC_DIR": "${FLUTTER_WORKSPACE}/app/comp_surf_pbr",
- "COMP_SURF_PBR_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/comp_surf_pbr/build",
- "COMP_SURF_PBR_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=Debug",
- "FLUTTER_AUTO_EXE": "LD_LIBRARY_PATH=${COMP_SURF_PBR_BUILD_DIR} ${FLUTTER_AUTO_BUILD_DIR}/shell/flutter-auto --j=${PLATFORM_ID_DIR_RELATIVE}/default_config.json --b=${PLATFORM_ID_DIR_RELATIVE}",
+ "HOMESCREEN_SRC_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen",
+ "HOMESCREEN_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/ivi-homescreen/build",
+ "HOMESCREEN_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=Debug -DENABLE_DLT=OFF",
+ "HOMESCREEN_EXE": "${HOMESCREEN_BUILD_DIR}/shell/homescreen --j=${PLATFORM_ID_DIR_RELATIVE}/default_config.json --b=${PLATFORM_ID_DIR_RELATIVE}",
"PING_CMD": "loginctl show-session $(awk '/tty/ {print $1}' <(loginctl)) -p Type",
"CREATE_BUNDLE_FOLDER": "mkdir -p ${PLATFORM_ID_DIR_RELATIVE}/data",
"COPY_PLATFORM_ID_TO_BUNDLE_FOLDER": "cp -r ${PLATFORM_ID_DIR}/default_config.json ${PLATFORM_ID_DIR_RELATIVE}/",
@@ -29,9 +26,9 @@
"config": {
"view": [
{
- "width": 1920,
- "height": 1080,
- "cursor_theme": "DMZ-White",
+ "width": 1920,
+ "height": 1080,
+ "cursor_theme": "DMZ-White",
"fullscreen": false
}
]
@@ -45,73 +42,32 @@
"sudo apt update -y",
"sudo apt install lsb-release wget software-properties-common gnupg apt-file",
"sudo apt-file update",
- "wget https://apt.llvm.org/llvm.sh",
- "chmod +x ./llvm.sh",
- "sed -i 's|add-apt-repository \"${REPO_NAME}\"|add-apt-repository -y \"${REPO_NAME}\"|g' ./llvm.sh",
- "sudo ./llvm.sh 14",
- "rm ./llvm.sh",
- "sudo apt install -y clang-14 lldb-14 lld-14 clangd-14 clang-tidy-14 clang-format-14 clang-tools-14 llvm-14-dev lld-14 lldb-14 llvm-14-tools libomp-14-dev libc++-14-dev libc++abi-14-dev libclang-common-14-dev libclang-14-dev libclang-cpp14-dev libunwind-14-dev",
"sudo apt install -y libwayland-dev wayland-protocols mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils libxkbcommon-dev ninja-build",
"sudo apt install -y build-essential libvulkan-dev vulkan-tools vulkan-validationlayers vulkan-utils libtool",
"sudo apt autoremove -y",
"sudo apt clean -y",
"cmake --version",
- "clang++ --version",
- "apt-file search cmake",
- "apt-file search clang++"
+ "apt-file search cmake"
]
},
"fedora": {
"cmds": [
"sudo dnf -y update",
"sudo dnf -y upgrade",
- "sudo dnf -y install wayland-devel wayland-protocols-devel libxkbcommon-devel cmake ninja-build mesa-dri-drivers mesa-filesystem mesa-libEGL-devel mesa-libGL-devel mesa-libGLU-devel mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-vulkan-drivers vulkan-tools libunwind-devel clang clang-analyzer clang-devel clang-libs clang-resource-filesystem llvm-devel clang-tools-extra lld lld-libs lldb libcxx libcxx-devel libcxx-static libcxxabi libcxxabi-devel libcxxabi-static gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel gstreamer1-plugins-bad-free-extras gstreamer1-plugins-base-tools gstreamer1-plugins-good gstreamer1-plugins-good-extras gstreamer1-plugins-ugly-free libtool",
+ "sudo dnf -y install wayland-devel wayland-protocols-devel libxkbcommon-devel cmake ninja-build mesa-dri-drivers mesa-filesystem mesa-libEGL-devel mesa-libGL-devel mesa-libGLU-devel mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-vulkan-drivers vulkan-tools libunwind-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel gstreamer1-plugins-bad-free-extras gstreamer1-plugins-base-tools gstreamer1-plugins-good gstreamer1-plugins-good-extras gstreamer1-plugins-ugly-free libtool",
"sudo dnf -y autoremove",
"cmake --version",
- "clang++ --version",
- "dnf provides cmake",
- "dnf provides clang++"
+ "dnf provides cmake"
]
}
}
},
"post_cmds": [
{
- "ubuntu": {
- "env": {
- "CC": "/usr/bin/clang",
- "CXX": "/usr/bin/clang++"
- }
- },
- "fedora": {
- "env": {
- "CC": "/usr/lib64/ccache/clang",
- "CXX": "/usr/lib64/ccache/clang++"
- }
- },
- "cwd": "${FLUTTER_AUTO_BUILD_DIR}",
- "cmds": [
- "cmake ${FLUTTER_AUTO_SRC_DIR} ${FLUTTER_AUTO_CMAKE_ARGS}",
- "make flutter-auto -j"
- ]
- },
- {
- "ubuntu": {
- "env": {
- "CC": "/usr/bin/clang",
- "CXX": "/usr/bin/clang++"
- }
- },
- "fedora": {
- "env": {
- "CC": "/usr/lib64/ccache/clang",
- "CXX": "/usr/lib64/ccache/clang++"
- }
- },
- "cwd": "${COMP_SURF_PBR_BUILD_DIR}",
+ "cwd": "${HOMESCREEN_BUILD_DIR}",
"cmds": [
- "cmake ${COMP_SURF_PBR_SRC_DIR} ${COMP_SURF_PBR_CMAKE_ARGS}",
- "make comp_surf_pbr -j"
+ "cmake ${HOMESCREEN_SRC_DIR} ${HOMESCREEN_CMAKE_ARGS}",
+ "make homescreen -j"
]
}
]
@@ -119,7 +75,7 @@
"overwrite-existing": true,
"custom-device": {
"id": "desktop-auto",
- "label": "Toyota flutter-auto",
+ "label": "Toyota Homescreen for AGL",
"sdkNameAndVersion": "flutter-auto x86_64",
"platform": "linux-x64",
"enabled": true,
@@ -128,7 +84,7 @@
"postBuild": "bash -c \"rm -rf ${PLATFORM_ID_DIR_RELATIVE}\"",
"install": "bash -c \"${STAGE_BUNDLE_FOLDER}\"",
"uninstall": "bash -c \"rm -rf ${PLATFORM_ID_DIR_RELATIVE}\"",
- "runDebug": "bash -c \"${FLUTTER_AUTO_EXE}\"",
+ "runDebug": "bash -c \"${HOMESCREEN_EXE}\"",
"forwardPort": null,
"forwardPortSuccessRegex": null,
"screenshot": null
diff --git a/meta-agl-flutter/tools/configs/flutter-engine.json b/meta-agl-flutter/tools/configs/flutter-engine.json
new file mode 100644
index 00000000..cf0a6a16
--- /dev/null
+++ b/meta-agl-flutter/tools/configs/flutter-engine.json
@@ -0,0 +1,101 @@
+{
+ "id": "flutter-engine",
+ "load": false,
+ "supported_archs": [
+ "x86_64",
+ "arm64"
+ ],
+ "supported_host_types": [
+ "ubuntu",
+ "fedora"
+ ],
+ "type": "generic",
+ "flutter_runtime": "debug",
+ "env": {
+ "DEPOT_TOOLS": "${FLUTTER_WORKSPACE}/app/depot_tools",
+ "ENGINE_ROOT": "${PLATFORM_ID_DIR}/engine",
+ "ENGINE_SRC_DIR_RELATIVE": "src",
+ "ENGINE_SRC_DIR": "${ENGINE_ROOT}/${ENGINE_SRC_DIR_RELATIVE}",
+ "ENGINE_BUILD_FLAGS": "--runtime-mode=debug --embedder-for-target --enable-fontconfig --disable-desktop-embeddings --no-build-embedder-examples --enable-impeller-3d --enable-impeller-opengles --no-lto --no-goma",
+ "ENGINE_BUILD_DIR": "${ENGINE_SRC_DIR}/out/host_debug",
+ "GN_ARGS_FILE": "${ENGINE_BUILD_DIR}/args.gn",
+ "GN_ARGS_APPEND": ""
+ },
+ "runtime": {
+ "gclient_config": {
+ "path": "${ENGINE_ROOT}",
+ "managed": false,
+ "name": "src/flutter",
+ "url": "https://github.com/flutter/engine.git",
+ "custom_vars": {
+ "download_android_deps": false,
+ "download_windows_deps": false,
+ "download_linux_deps": true,
+ "download_emsdk": false
+ },
+ "custom_deps": {
+ "src/third_party/dart/third_party/pkg/tools": "https://dart.googlesource.com/tools.git@545d7e1c73ce21b8c91f638021f9d487d324a501"
+ },
+ "deps_file": "DEPS",
+ "safesync_url": ""
+ },
+ "pre-requisites": {
+ "arm64": {
+ "ubuntu": {
+ "cmds": [
+ "sudo apt install pkg-config libfreetype-dev git"
+ ]
+ },
+ "fedora": {
+ "cmds": [
+ "sudo dnf install pkg-config freetype-devel git"
+ ]
+ }
+ },
+ "x86_64": {
+ "ubuntu": {
+ "cmds": [
+ "sudo apt install pkg-config libfreetype-dev git"
+ ]
+ },
+ "fedora": {
+ "cmds": [
+ "sudo dnf install pkg-config freetype-devel git"
+ ]
+ }
+ }
+ },
+ "post_cmds": [
+ {
+ "env": {
+ "PATH": "${DEPOT_TOOLS}:$PATH"
+ },
+ "cwd": "${ENGINE_ROOT}",
+ "cmds": [
+ "gclient sync -D -R --revision ${FLUTTER_ENGINE_VERSION} -v"
+ ]
+ },
+ {
+ "env": {
+ "PATH": "${DEPOT_TOOLS}:$PATH"
+ },
+ "cwd": "${ENGINE_SRC_DIR}",
+ "cmds": [
+ "./flutter/tools/gn ${ENGINE_BUILD_FLAGS}",
+ "echo ${GN_ARGS_APPEND} >> ${GN_ARGS_FILE}",
+ "ninja -C ${ENGINE_BUILD_DIR}"
+ ]
+ },
+ {
+ "cwd": "${ENGINE_BUILD_DIR}",
+ "cmds": [
+ "bash -c \"rm -rf ${PLATFORM_ID_DIR}/bundle | true\"",
+ "mkdir -p ${PLATFORM_ID_DIR}/bundle/data/",
+ "mkdir -p ${PLATFORM_ID_DIR}/bundle/lib/",
+ "cp ${ENGINE_BUILD_DIR}/icudtl.dat ${PLATFORM_ID_DIR}/bundle/data/",
+ "cp ${ENGINE_BUILD_DIR}/libflutter_engine.so ${PLATFORM_ID_DIR}/bundle/lib/"
+ ]
+ }
+ ]
+ }
+} \ No newline at end of file