aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-wam/chromium
AgeCommit message (Collapse)AuthorFilesLines
2023-04-26chromium: Bump SRCREVRoger Zanoni1-1/+2
This includes changes for restoring gRPC third_party code and replacing the dbus API for gRPC to communicate with applaunchd. Bug-AGL:⋅SPEC-4764 Signed-off-by:⋅Roger⋅Zanoni⋅<rzanoni@igalia.com> Change-Id: I1a5354a3faa4cec567dd06361dc089de3249128f
2023-01-20chromium: bump SRCREVRoger Zanoni1-1/+1
This includes chromium changes to use the added functionality of agl-shell protocol versions 2 and 3 Bug-AGL: SPEC-4649, SPEC-4647 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: Ia12df48cbb715fca998f2a64d13a9b9791abca89
2022-09-05chromium: fix wayland protocol version checks.Jose Dapena Paz1-1/+1
chromium: 16915e06c4..6296f0af4c 6296f0af4c [op][wayland] Add Wayland protocol version checking Bug-AGL: SPEC-4540 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: Ica15034d397bddcef20ff4377c6bd551d7f03b1a
2022-07-31wam: use gRPC for internal IPC.needlefish_13.92.0needlefish/13.92.013.92.0Jose Dapena Paz1-1/+1
Update WAM to use GRPC for internal IPC instead of Unix domain sockets, dropping previous implementation. Update dependencies to use grpc and protobuf. chromium: 9d9fbef68a..9fe715038f 9fe715038f [op][agl][wayland] Drop window surface ID wam: 491dcd1..3cc744f 3cc744f [wam][agl][wayland] Remove surface ID. 12d9778 [wam][agl][ipc] Rename WamSocketLockFile to WamIPCLockFile fc5f7ff [wam][agl][ipc] Remove Unix Domain socket based IPC implementation 92a3356 [wam][agl][ipc] Introduce LaunchParams struct replacing LaunchData 61ce1d0 [wam][agl][ipc] Add gRPC implementation of internal IPC ae51589 [wam][agl] Make IPC pass its parameters instead of storing them Bug-AGL: SPEC-4252 Change-Id: I8edbe1d47a684f73feadfed6cbd944c01b6d2ceb Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-06-13chromium, wam: fix repository branches.Jose Dapena Paz1-1/+1
Though git hashes for OSE 2.16 rebase were added, the branch names are different reflecting the upstream baseline. Bug-AGL: SPEC-4377 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: I065ad84a36e120e9f425220251cb04a466a2f99a
2022-06-13chromium91=ose17.agl,wam=ose57: update Chromium and WAM to webOS OSE 2.16 ↵Jose Dapena Paz1-2/+2
baseline Rebased chromium91 and wam on top of the versions s hipped in webOS OSE 2.16 release. chromium91: ose11.agl..ose17.agl 78e203bfd6 [op][n_upsable][media] Fix upstream v4l2 video encoder for webos c6decb5ddd fixup! [op][n_upsable][media] Support for enabling use_neva_v4l2_codec 98ae785c0c [op][n_upsable][input] Fix crash on rwhva::OnTextSelectionChanged ed1a510acd [op][n_upsable][wayland] Check count inited displays c1afea619c [op][n_upsable][static_analysis] Fix "Unchecked return value" issue 1fbec7a090 [op][n_upsable][static_anaysis] Fix unrecoverable parse warning 5da09aead6 [op][n_upsable][suspend] Ignoring Page::SetPaused while its destroying 4fa834ef5e fixup! [op][n_upsable][app_shell] Implement Cookie Management using JS Injection 14e4a3fc83 [op][n_upsable][app_shell] Implement Cookie Management using JS Injection d5eebe0504 [op][n_ups][browser][app_shell] Disable Badging API f977972288 fixup! [op][n_upsable][media] Implement MediaSessionObserver for WebOS 36009fdf8d fixup! [op][n_upsable][app_shell] Implement site filter using JS Injection 06d44f5ebd fixup! [op][n_upsable][web_security] Check access to local file for media e5142a78ed fixup! [op][n_upsable][media] Fix crash in ForeignVideoWindowProvider e1dda8653e [oe][ds][gpu] Bypass the error when shared image is not cleared 2e1baa2ffd [op][n_upsable][app_shell] PopUp blocker feature using JS Injection 5b3a3e0bcc [op][n_upsable][app_shell] Implement site filter using JS Injection f06876e1c3 [op][n_upsable][app_shell] Implement URLDatabase using sqlite 6b29edc477 [op][upsable][build] breakpad: fix build with glibc-2.34 91cab725d2 [op][ups][build] abseil-cpp: fix build with glibc-2.34 wam: ose57.agl..ose58.agl 703efea [oe][locale] Fixed incorrect access to locale json data Bug-AGL: SPEC-4377 Change-Id: I5d0cb70c2d8ec8c68a73ad05a087c93a3a9912d2 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-05-26chromium: do not build with Swiftshader and Dawn.Jose Dapena Paz1-3/+7
We want to use the native GL implementation in our targets. So there is no use for Swiftshader, and it increases building time. We also drop Dawn, though that will imply we do not support WebGPU. That should be reenabled later. Bug-AGL: SPEC-4391 Change-Id: I8dddf66d39f58db005f1fbddc0acc4008c8ce3ab Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-05-26chromium: drop browser and mksnapshot packaging.Jose Dapena Paz2-77/+2
To reduce how much it is built with Chromium, just remove a couple of parts that are not used: * Chromium browser is not used or packaged, and we intend to use a lighter version with app-shell and enact browser likely. * mksnapshot cross package was intended for optimizing launch time of certain web applications. But we are not using it yet. Bug-AGL: SPEC-4391 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: Id9f15c42c81341962f1f0c7a91b31824f116a9ef
2022-05-13chromium: fix aarch64 build because of broken NEON extensions for GCCJose Dapena Paz1-0/+3
highway library implementation of NEON extensions for aarch64 does not build on GCC in the version used in chromium91. Provisionally disable JPEG-XL decoder for aarch64 to workaround the problem. Bug-AGL: SPEC-4355 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: Idb6ad1a16e6dca773e22ca5747ffdef09a35af5c
2022-05-13chromium, html5-*: adapt to kirkstoneJose Dapena Paz2-9/+6
Adapt the recipes to the changes required by Yocto kirkstone: * Explicit python2 dependency. * Replace _ with : as separator in variables. * Explicit pkgconfig dependency. * Assume always upstream ozone wayland. chromium91: 2c7cb69495..d052051b3b d052051b3b [op][ups][build] Fix with more recent libstdc++ in kirkstone deb1439137 [op][ups][build] Fix breakpad build with kirkstone glibc. e6ee1dd0d0 [op][ups][build] Fix abseil-cpp build with glibc in kirkstone wam: 692f706..31840bc 31840bc [op][w_upsable] IWYU: std::string used in LogManagerConsole 15ce17e [op][n_upsable][build] IWYU: std::numeric_limit used in WebPageBlink missing include. 848565d fixup! [op][agl] New QtLess AGL port html5-homescreen: 5c9e060..fc0ffa4 fc0ffa4 Update to recent dependencies a42b304 Launch background after launcher. html5-launcher: cb6b66c..1283e3b 1283e3b Update dependencies. html5-background: 7b79640..e91be22 e91be22 Update to recent dependencies. html5-hvac: e64d69b..6abbe87 6abbe87 Update to recent dependencies. Bug-AGL: SPEC-4261 Change-Id: I48581a57df3ff22d8aaab2334e4f9b4127a6d427 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-05-13chromium=91.0.4472.114.ose11.agl, wam=ose57.aglJose Dapena Paz2-7/+11
Move to webOS OSE 2.15.0 baseline of wam and chromium. This includes: * Migration from chromium 87.* to chromium 91.* * New error page. * Bring back LTTng support in WAM. * Misc fixes to AGL build for chromium 91. Bug-AGL: SPEC-4261 Change-Id: Ia81c515b97e27da53e054fdc89622b7be0e8e1b5 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-05-13wam, chromium, html5-*: improve initial frame, and drop usage of config.xmlJose Dapena Paz1-1/+1
Move to use appinfo.json, new CLI interface, and fix flickering partially. chromium87: be0370b198..c9a66f75a7 c9a66f75a7 fixup! [op][n_upsable][splash][fmp] New splash and FMP implementation d7953f5e17 Revert "[op][agl][splash] Show immediately apps" wam: 8dd3f17..f4c2e95 f4c2e95 fixup! agl/web_app_manager_service_agl: Fix minor typo c072a91 agl/web_app_manager_service_agl: Fix minor typo 761961c web_runtime_agl, web_app_manager_service_agl: Add WebOS appinfo.json support 1ac280e web_runtime_agl: Pass arguments rather than env variables 6e0477f web_runtime_agl: remove setupsurface, nobody is using it 0d83a34 web_runtime_agl: Remove CYNOGARA auth token 4159489 fixup! [op][agl][wayland] Properly adapt dimensions for web apps using panel html5-homescreen: 21bd1dc..7d89048 7d89048 Launch background after launcher. 5c9e060 Use appinfo.json instead of config.xml * Change branch to master html5-launcher: b371797..cb6b66c cb6b66c Use appinfo.json instead of config.xml * Change branch to master html5-background: 16db46b..7b79640 7b79640 Use appinfo.json instead of config.xml 160a4f9 Add .gitreview file * Use AGL gerrit and change branch to master html5-hvac: 45641bf..e64d69b e64d69b Use appinfo.json instead of config.xml * Change branch to master Bug-AGL: SPEC-3982, SPEC-4251, SPEC-4301, SPEC-4312, SPEC-4315 Change-Id: Ibd2bc428910e6e39c52e14b8e969fdea77000a84 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-04-13Update to SPDX license namesScott Murray1-1/+1
Apply updates from running the new convert-spdx-licenses script from upstream. This is not currently a hard requirement from upstream, but futureproofs for when the license name mapping is finally removed. Additionally, a few license declarations of just "BSD" have been updated with the more specifc "BSD-3-Clause" after inspecting the licenses in the source, as the non-specific name now triggers a warning. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ia86d412fe76ff3217456fcea81cb44f68bc1ced8
2022-03-24chromium87: fix initialization of drag data controllerJose Dapena Paz1-1/+1
Land change in chromium to properly initialize drag data controller in AGL. chromium87: fa99cf3344..ed92389df6 ed92389df6 [op][n_upsable][wayland] Fix initialization of drag data controller Bug-AGL: SPEC-4288 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com> Change-Id: I1cf413ac2e0742a2fda2f9787f0c4733fb5804b2
2022-03-07meta-agl-demo: use HTML5 homescreen+background+launcher in HTML5 demoJose Dapena Paz1-1/+1
Adapt to use again html5-homescreen and html5-background: * Added html5-background and html5-homescreen. * Now only html5-homescreen is launched from systemd, while html5-launcher and html5-background are launched from html5-homescreen logic. * Use landscape weston configuration as expected in HTML5 demo. * Pass --agl-shell-appid=homescreen to WebAppMgr script so it knows which application implements the UI of agl_shell wayland protocol. chromium: bc1410d..fa99cf3344 fa99cf3344 [op][agl][wayland] Activate applications when requested from applaunchd ab1a4cf05d [op][agl][injection] AGL D-Bus implementation of PAL appservice e5f6143e55 [op][agl][injection] Add application service injection wam: b0c1e46..8dd3f17 8dd3f17 [op][agl][wayland] Remove unused role code. defc5af [op][agl][wayland] Fix: do not ignore Panel shell surface type. 6683b08 [op][agl][wayland] Set AGL application ID in all cases 0bb9814 [op][agl][wayland] Properly adapt dimensions for web apps using panel 9af0d23 [op][agl][wayland] Properly pass surface size, type and edge to chromium e6df86b [op][agl][injection] Declare in web app XML the required injections Bug-AGL: SPEC-4250 Change-Id: Ie1b1181f3a67ea2ada1912db53e360178a4cf443 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-21chromium: fix build with sandbox host compilerJose Dapena Paz1-1/+1
chromium87: 7412ccde56..bc1410d5ad bc1410d5ad [op][n_upsable][build] Fix build because of returning to base::Optional without move Bug-AGL: SPEC-4260 Change-Id: Id204d26252932309753b5dd2820054ccea5b5c96 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-15chromium: reduce verbosity on compilationJose Dapena Paz1-1/+1
Compilation of chromium is done invoking ninja with -v. This adds a lot of noise to compilation. This patch drops the flag. Bug-AGL: SPEC-4142 Change-Id: I0dd3700c1ebecab99776e24d79a98211ff8f592d Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-15chromium, wam: update to chromium87 tree.Jose Dapena Paz2-11/+19
Update to chromium87 tree, and wam adapted to chromium87. This does not include yet the webOS OSE QtLess version, but the submission right before QtLess work. This is because in webOS OSE current chromium87 release, the only work after the submission we are using is QtLess, without adding any new functionality. Renamed the recipe and package name to be "chromium" instead of "chromium84" or "chromium87". Now we use PV to state the version of the upstream Chromium. The Chromium87 tree history has been heavily simplified to make it easier to rebase in next upgrades. Bug-AGL: SPEC-4142, SPEC-4225, SPEC-4227, SPEC-4228 Change-Id: I6caed396f758dd80291803266f6a59f1fec406c4 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*, wam: fix systemd launching from systemdJose Dapena Paz4-194/+1
Instead of providing a SMACK aware system service for WAM per session instance, provide a systemd user service depending on the new services in Marlin. Update the chromium84 and wam heads to include the required changes. We also remove the patches applied from recipe, so they belong to the chromium tree now. chromium84: 3d6fd5dd0b..4a320225eb 4a320225eb [op][agl][wayland] Take into account wayland output transform 13d93f6dae [op][agl][wayland] Do not bind agl_shell by default. ca47b4fd0a [skia][build] fix skia no_sanitize build issues for gcc 3b7541e3cf GCC: supress invalid-offsetof warning 6cd04072fb Add a delay to agl ready event wam: 935be6b..8607609 8607609 [op][agl][wayland] UiSize should be system resolution. fcfeb67 [op][agl] Allow to run web applications in new application framework. Bug-AGL: SPEC-4223 Change-Id: Ie0bc3dd6878920a0ba1bfac4f32814a23e4d41e7 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*: remove jumbo build optionsJose Dapena Paz2-11/+1
Jumbo build is not supported anymore in Chromium. This changeset removes all references in recipe to that mode. Bug-AGL: SPEC-4233 Change-Id: I7a667c9a36bd0b825fc3014520d1b23f53828b57 Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2022-02-01chromium*: set by default debugging symbol level to 1Jose Dapena Paz1-20/+6
Instead of forcing symbol level to 0, that removes all debugging information from build, set the default level to 1. This change adds two new PACKAGECONFIG named "debug" (for setting the symbol level for the whole build to 2) and "debug-blink" (for setting the symbol level for blink part to 2). By default, if not present, symbol level will be set to 1. Symbol level is equivalent to the -g level (symbol_level=1 means -g1, symbol_level=2 means -g or -g2). This is copied from the webOS OSE web runtime Yocto recipe. Bug-AGL: SPEC-4233 Change-Id: I70a983a04497aefdf9fde7074bbf0cfdf0bb8eab Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
2021-12-22chromium: fix use of += with :appendScott Murray1-2/+2
Fix a couple of instances where += is used with a variable :append definition, this future-proofs for Kirkstone (it currently triggers a warning on poky master, as may soon be treated as an error). Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I1ff076e174d686226dc4507413ec11dcda2e77db
2021-12-07web-runtime: bump chromium84 and wam SRCREVLorenzo Tilve1-2/+2
Update SRCREVs to new marlin branches removing the build dependencies with the appfw. Bug-AGL: SPEC-4121 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I5cc9ffca3101b58f750c377dfa14355e2a1d1ce6
2021-12-07web-runtime: Add wam to agl-demo-platform-html5 imageLorenzo Tilve1-3/+1
Include wam dependency on agl-demo-platform-html5 target. Bug-AGL: SPEC-4121 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I3355a0a96b906131fa1d2e11c4b29d3951879ad9
2021-11-04The chromium recipe will need to be reworkedJan-Simon Möller1-1/+3
Meanwhile update it to allow CI to pass. Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I03f92e6c8bd6146d4a67ec447be5ab362b42f5bc
2021-11-03Prepare master for new framework integrationJan-Simon Möller2-20/+1
During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - recipes-apis : all agl-service-* - recipes-demos: all demo apps but homescreen - non-essential configurations Todo: We need to bring-back the html5 image in a follow-up w/o ties into the old framework. v2: kept WAM + Chromium recipes for reference v3: rebased Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I58075f5f1e477106a1aad3d2171a0904bf0cb16e
2021-11-03Update github.com git:// SRC_URIsmarlin_12.90.1marlin/12.90.112.90.1Scott Murray1-1/+1
GitHub is dropping unauthenticated git protocol access in January 2022, per: https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git While a workaround in the BitBake git fetcher is forthcoming, not specifying protocol=https for github.com git:// SRC_URIs will start resulting in warnings in Yocto 3.5/Kirkstone. To ease our upgrade path, go ahead and update our affected SRC_URIs. Note that this has been done by running the scripts/contrib/convert-srcuri.py script from latest poky, which also makes git branch specification explicit since the git fetcher is likely to require that in the future due to widespread switches from master to main branches. Bug-AGL: SPEC-4126 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibfa59ef83db75f95c4b47b28213b60d8cf19fba1
2021-08-20Convert to new override syntaxScott Murray3-35/+35
This is the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac
2021-06-29chromium84: Add a delay to agl ready eventmarlin_12.90.0marlin/12.90.012.90.0Roger Zanoni2-0/+71
Delay ready() to ensure that all the window and surfaces setup is done before notifying the compositor There's a work in progress for enabling wam to display multiple surfaces for a single widget, which would eliminate the chain loading that currently causes this issue. This change includes a temporary patch that should be removed once wam changes are integrated. Bug-AGL: SPEC-3799 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I9945af60077a79d56052c3fdb358e9fed44874e6
2021-06-23chromium84: Fix externalsrc build/installRoger Zanoni1-21/+19
Bug-AGL: SPEC-3856 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I1be5b766072cfae162e4514b33b7b9fd3aab5476
2021-05-21chromium84: bump SRCREVRoger Zanoni1-1/+1
Update SRCREV to include a build fix for qemux86-64 with gcc version < 8 Bug-AGL: SPEC-3830 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: Ic7ac86eb7c503d841c3228bd51ffcb1b2c19463d
2021-05-12Restore chromium target and browser servicelamprey_11.91.0lamprey/11.91.011.91.0Roger Zanoni3-11/+31
- Merged chromium changes to fix build after bumping to chromium 84 - Fixed chromium install on current recipe - Restored the chromium browser service Bug-AGL: SPEC-3830 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I5cde7972021a4200581c2e161f848bcf7d8d0458
2021-03-24web-runtime: Fix chromium do_install on yp 3.1.6Roger Zanoni2-3/+13
Remove DESTDIR from the build directory Bug-AGL: SPEC-3856 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: I7ea01750daab1522f2e7558a11e0594ec0772bba
2021-03-24web-runtime: Update from chromium79 to chromium84Roger Zanoni5-102/+160
This patch contains all the squashed changes needed to bump WAM and chromium, including the ported changes from cr79. Bug-AGL: SPEC-3806 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: If2b18e2978e8b1050e4b167b9627c1a526867cfb
2021-01-13web-runtime: Bump chromium79 and wam to adress first-frame dection and loggingLorenzo Tilve2-16/+4
Bump the versions of Chromium79 to include a workaround for the webapps launching delay that was introduced in order to address problems happening with first-frame detection. These updates also fix full WAM verbosity to journalctl when defined, and building Chromium with externalsrc, and removes lld and gold. Also iclude explicit dependency chain when building html5 dempo platform to packagegroup-agl-profile-graphical-html5. Bug-AGL: SPEC-3576 Bug-AGL: SPEC-3767 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com> Change-Id: I34b0001c58522cfc7940d0384809e14e3d999ea8
2021-01-08web-runtime: Update from chromium68 to chromium79Lorenzo Tilve6-287/+198
This patch contains all the squashed changes needed to bump WAM and Chromium to M79, including all the ported changes from both upstream Chromium, webOSE and and the former chromium 68 version. It includes the needed changes on the recipes, and bumps the versions to the new commits/branches of the Chromium and Wam repositories. The split of the ongoing changes merged is available here: https://github.com/Igalia/meta-agl-html5-dev/commits/chromium79 Bug-AGL: SPEC-3576 Change-Id: Ia0de6f11001189789d4ffbf01ed81929c57bc7c5 Signed-off-by: Lorenzo Tilve <ltilve@igalia.com>
2020-12-17SPEC-3723: restructure meta-agl-demoJan-Simon Moeller4-0/+620
All demo related components should be in here now. We keep the packagegroups on purpose for now to stay backward-compatible. v2: layer does pass yocto-check-layer, dependencies adapted v3: remove the dynamic-layer setup, use all-in-one approach v4: Fixed comments from Paul Barker. Tnx! v5: Removed wayland/weston/agl-compositor additions, except for demo specific weston-init bbappend Follow-up changes required later: - massaging packagegroups - scrub of recipes Bug-AGL: SPEC-3723 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8