From: Joel Winarske <joel.winarske@gmail.com>
Date: Thu, 21 Mar 2024 15:56:25 +0000 (-0700)
Subject: Update meta-flutter
X-Git-Tag: 17.91.0~20
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7995b8ff68f04cb6cdcefd7a5aa8345498ba0abb;p=AGL%2Fmeta-agl-devel.git

Update meta-flutter

-renames meta-flutter to flutter-layer
-adds meta-flutter-apps named flutter-apps-layer
-moves flutter-gallery to dynamic layer

Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
Change-Id: I273ca820b86273e7e7de11cc25c57fca295643fc
---

diff --git a/meta-agl-flutter/conf/include/agl-flutter.inc b/meta-agl-flutter/conf/include/agl-flutter.inc
index cf489d02..38db25e8 100644
--- a/meta-agl-flutter/conf/include/agl-flutter.inc
+++ b/meta-agl-flutter/conf/include/agl-flutter.inc
@@ -1,7 +1,3 @@
 AGL_FEATURES += "agl-flutter"
 
-FLUTTER_SDK_TAG = "3.13.9"
-
-# Mask libstd-rs bbappend out since the change it makes does not
-# build with newer versions of Rust.
-BBMASK += "meta-flutter/recipes-devtools/rust/libstd-rs_%.bbappend"
+FLUTTER_SDK_TAG = "3.19.3"
diff --git a/meta-agl-flutter/conf/layer.conf b/meta-agl-flutter/conf/layer.conf
index 85cc3aa7..725a25b2 100644
--- a/meta-agl-flutter/conf/layer.conf
+++ b/meta-agl-flutter/conf/layer.conf
@@ -5,10 +5,15 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-agl-flutter"
-BBFILE_PATTERN_meta-agl-flutter = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-agl-flutter = "61"
+BBFILE_COLLECTIONS += "agl-flutter-layer"
+BBFILE_PATTERN_agl-flutter-layer = "^${LAYERDIR}/"
+BBFILE_PRIORITY_agl-flutter-layer = "61"
 
-LAYERVERSION_meta-agl-flutter = "1"
-LAYERDEPENDS_meta-agl-flutter = "core meta-flutter"
-LAYERSERIES_COMPAT_meta-agl-flutter = "kirkstone"
+LAYERVERSION_agl-flutter-layer = "1"
+LAYERDEPENDS_agl-flutter-layer = "core flutter-layer"
+LAYERRECOMMENDS_agl-flutter-layer = "flutter-apps-layer"
+LAYERSERIES_COMPAT_agl-flutter-layer = "kirkstone"
+
+BBFILES_DYNAMIC += " \
+    flutter-apps-layer:${LAYERDIR}/dynamic-layers/flutter-apps-layer/*/*/*/*.bbappend \
+"
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service
similarity index 100%
rename from meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery/flutter-gallery.service
rename to meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery/flutter-gallery.service
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_%.bbappend b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend
similarity index 100%
rename from meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_%.bbappend
rename to meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_%.bbappend
diff --git a/meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc b/meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc
similarity index 100%
rename from meta-agl-flutter/recipes-graphics/flutter-apps/flutter-gallery_aglflutter.inc
rename to meta-agl-flutter/dynamic-layers/flutter-apps-layer/recipes-graphics/flutter-apps/first-party/flutter-gallery_aglflutter.inc
diff --git a/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_%.bbappend b/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_%.bbappend
deleted file mode 100644
index f983e7e9..00000000
--- a/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agl-flutter', 'flutter-sdk_aglflutter.inc', '', d)}
diff --git a/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_aglflutter.inc b/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_aglflutter.inc
deleted file mode 100644
index ce3574d7..00000000
--- a/meta-agl-flutter/recipes-graphics/flutter-sdk/flutter-sdk_aglflutter.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# fix for the archiver:
-# the function get_flutter_sdk_version does access the network
-# when it is expanded later in the archiver, we need to allow the network
-do_ar_original[network] = "1"
diff --git a/meta-agl-flutter/tools/configs/_globals.json b/meta-agl-flutter/tools/configs/_globals.json
index 35838b67..4caf9e8a 100644
--- a/meta-agl-flutter/tools/configs/_globals.json
+++ b/meta-agl-flutter/tools/configs/_globals.json
@@ -1,5 +1,5 @@
 {
-    "flutter-version": "3.13.2",
+    "flutter-version": "3.19.3",
     "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 e15bd123..7002d416 100644
--- a/meta-agl-flutter/tools/configs/_repos.json
+++ b/meta-agl-flutter/tools/configs/_repos.json
@@ -1,36 +1,9 @@
 [
     {
         "uri": "https://github.com/toyota-connected/ivi-homescreen.git",
-        "rev": "f42c61c5349ed4981767239f6ba052c315d89c3a",
+        "rev": "ee49745485a88f23c32b8e3a62da40d4102c4623",
         "branch": "agl"
     },
-    {
-        "uri": "https://github.com/flutter/packages.git",
-        "branch": "main"
-    },
-    {
-        "uri": "https://github.com/flutter/gallery.git",
-        "branch": "master",
-        "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"
-    },
-    {
-        "uri": "https://github.com/meta-flutter/flutter_animated_background.git",
-        "branch": "meta-flutter",
-        "rev": "46f35ad2a323ab006813a3c4748163536b0fc332",
-        "pubspec_path": "flutter_animated_background/example"
-    },
-    {
-        "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/flutter-engine.json b/meta-agl-flutter/tools/configs/flutter-engine.json
deleted file mode 100644
index cf0a6a16..00000000
--- a/meta-agl-flutter/tools/configs/flutter-engine.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "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
diff --git a/templates/feature/agl-flutter/50_bblayers.conf.inc b/templates/feature/agl-flutter/50_bblayers.conf.inc
index 4c8f1ae5..ea62d7c4 100644
--- a/templates/feature/agl-flutter/50_bblayers.conf.inc
+++ b/templates/feature/agl-flutter/50_bblayers.conf.inc
@@ -3,4 +3,5 @@ AGL_META_CLANG = " ${METADIR}/external/meta-clang "
 BBLAYERS =+ " \
    ${METADIR}/meta-agl-devel/meta-agl-flutter \
    ${METADIR}/external/meta-flutter \
+   ${METADIR}/external/meta-flutter/meta-flutter-apps \
 "