Merge branch 'esben/appspawn-segv' into 'kirkstone'

Drop patch workaround to appspawn segfault

See merge request eclipse/oniro-oh/meta-openharmony!111

recipes-openharmony/openharmony/openharmony-standard-3.0/ParagraphTxt-ComputeLineBreaks-skip-sigsegv-code.patch

-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-ParagraphTxt::ComputeLineBreaks() is causing a segmentation fault for some reasons. 
-This is causing hap applications to crash, including ACTS test suites
-and status bar.
-As a temporary solution we skip the part of the code that
-is raising the segfault. The side effect of this is that texts are 
-not properly rendered.
-
-Apply to third_party/flutter
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
-diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc
-index 49594991..ed22d885 100644
---- a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc
-+++ b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc
-@@ -250,6 +250,10 @@ void ParagraphTxt::SetInlinePlaceholders(
- }
- 
- bool ParagraphTxt::ComputeLineBreaks() {
-+
-+  // skipping ComputeLineBreaks execution because it is source of segfault problems.
-+  return true;
-+
-   line_ranges_.clear();
-   line_widths_.clear();
-   max_intrinsic_width_ = 0;

recipes-openharmony/openharmony/openharmony-standard_3.0.bb

@@ -72,7 +72,6 @@ SRC_URI += "file://base_hiviewdfx_hiview-libfaultlogger-static.patch;patchdir=${
 # Patch to allow /system/profile and /system/usr to be symlinks to /usr/lib/openharmony
 SRC_URI += "file://foundation_distributedschedule_safwk-slash-system-symlink.patch;patchdir=${S}/foundation/distributedschedule/safwk"
 
-SRC_URI += "file://ParagraphTxt-ComputeLineBreaks-skip-sigsegv-code.patch;patchdir=${S}/third_party/flutter"
 SRC_URI += "file://test-xts-acts-testcase-timeout-increment.patch;patchdir=${S}/test/xts/acts"
 SRC_URI += "file://test-xts-acts-start-ability-timeout-increment.patch;patchdir=${S}/test/xts/acts"
 SRC_URI += "file://test-xts-acts-fix-Defpermission-typo.patch;patchdir=${S}/test/xts/acts"
@@ -212,6 +211,9 @@ do_install () {
     # For now, this fix is sufficient.
     [ "${@get_ohos_libdir(d)}" != "lib" ] && ln -s ${@get_ohos_libdir(d)} ${D}/system/lib
 
+    # There is also a few files in /system/usr
+    cp -r -t ${D}/system/ ${OHOS_PACKAGE_OUT_DIR}/system/usr
+
     # system ability configurations
     mkdir -p ${D}${libdir}/openharmony/profile
     cp -r  ${OHOS_PACKAGE_OUT_DIR}/system/profile/* ${D}${libdir}/openharmony/profile
@@ -254,7 +256,7 @@ FILES:${PN}:remove = "${libdir}/${BPN}/*"
 FILES:${PN}-configs = "${sysconfdir}"
 FILES:${PN}-fonts = "${datadir}/fonts"
 
-FILES:${PN} += "/system/bin ${@get_ohos_libdirs(d)} /system/profile"
+FILES:${PN} += "/system/bin ${@get_ohos_libdirs(d)} /system/profile /system/usr"
 FILES:${PN}-configs += "/system/etc"
 FILES:${PN}-fonts += "/system/fonts"