Merge branch 'wip/acts' into 'kirkstone'

openharmony-standard-3.0: add patches and initialization changes to fix ACTS failures

See merge request eclipse/oniro-core/meta-openharmony!88

recipes-openharmony/openharmony/files/openharmony-preinit

@@ -75,8 +75,11 @@ mkdir -p /data/vendor/hardware
 mkdir -p /data/weston
 mkdir -p /usr/lib/dri
 
-# /dev/binder needs to be rw for all users
+chmod -R 777 /data
+
+# /dev/binder and /dev/ashmem need to be rw for all users
 chmod 666 /dev/binder
+chmod 666 /dev/ashmem
 
 # /dev/dri/card0 needs to be rw for all users
 if [ -c /dev/dri/card0 ]; then

recipes-openharmony/openharmony/files/openharmony-preinit.service

@@ -4,6 +4,7 @@ Description=OpenHarmony pre-init setup
 [Service]
 Type=oneshot
 ExecStart=/bin/sh /usr/sbin/openharmony-preinit
+RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/openharmony-standard-3.0/RenderText-PerformLayout-remove-sigsegv-code.patch

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+RenderText::PerformLayout() is causing a SIGSEGV for some reasons. 
+The error appears to be raised in the Measure method(). This is
+causing hap applications to crash, including ACTS test suites.
+As a temporary solution we are removing the part of the code that
+is raising the segfault. The side effect of this is that texts are 
+not properly rendered.
+
+Apply to foundation/ace/ace_engine
+
+Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
+Upstream-Status: Inappropriate
+
+diff --git a/frameworks/core/components/text/render_text.cpp b/frameworks/core/components/text/render_text.cpp
+index f3135d3c..813d6179 100644
+--- a/frameworks/core/components/text/render_text.cpp
++++ b/frameworks/core/components/text/render_text.cpp
+@@ -133,8 +133,8 @@ void RenderText::PerformLayout()
+     if (pipelineContext) {
+         UpdateIfChanged(dipScale_, pipelineContext->GetDipScale());
+     }
+-    Size size = Measure();
+-    SetLayoutSize(GetLayoutParam().Constrain(size));
++    // Size size = Measure();
++    // SetLayoutSize(GetLayoutParam().Constrain(size));
+     for (const auto& spanChild : GetChildren()) {
+         if (spanChild) {
+             const auto& param = GetLayoutParam();

recipes-openharmony/openharmony/openharmony-standard-3.0/remove-root-uid-check.patch

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+OpenHarmony uses couple of UIDs/GIDs for running it's services.
+Currently in meta-openharmony we have everything run as root, which 
+causes some issues in starting abilities. As a temporary workaround
+we are removing the Uid check.
+
+Apply to foundation/aafwk/standard
+
+Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
+Upstream-Status: Inappropriate
+
+diff --git a/services/abilitymgr/include/ability_util.h b/services/abilitymgr/include/ability_util.h
+index a090a1eb..d495a75b 100644
+--- a/services/abilitymgr/include/ability_util.h
++++ b/services/abilitymgr/include/ability_util.h
+@@ -144,10 +144,10 @@ static sptr<AppExecFwk::IBundleMgr> GetBundleManager()
+         if (callerUid == -1) {
+             callerUid = IPCSkeleton::GetCallingUid();
+         }
+-        if (ROOT_UID == callerUid) {
+-            HILOG_ERROR("uid is root,ability cannot be start when the visible is false");
+-            return ABILITY_VISIBLE_FALSE_DENY_REQUEST;
+-        }
++        // if (ROOT_UID == callerUid) {
++        //     HILOG_ERROR("uid is root,ability cannot be start when the visible is false");
++        //     return ABILITY_VISIBLE_FALSE_DENY_REQUEST;
++        // }
+         auto bms = GetBundleManager();
+         CHECK_POINTER_AND_RETURN(bms, GET_ABILITY_SERVICE_FAILED);
+         auto isSystemApp = bms->CheckIsSystemAppByUid(callerUid);

recipes-openharmony/openharmony/openharmony-standard-3.0/xf86drm.c-Add-drmWaitVBlank-hack.patch

@@ -35,9 +35,10 @@ index b49d42f..0e2805a 100644
             if (cur.tv_sec > timeout.tv_sec + 1 ||
                 (cur.tv_sec == timeout.tv_sec && cur.tv_nsec >=
                  timeout.tv_nsec)) {
-@@ -2187,9 +2188,11 @@ drm_public int drmWaitVBlank(int fd, drmVBlankPtr vbl)
+@@ -2187,9 +2188,12 @@ drm_public int drmWaitVBlank(int fd, drmVBlankPtr vbl)
                     break;
             }
++           usleep(10000);
         }
 -    } while (ret && errno == EINTR);
 +    } while (ret && (errno == EINTR || errno == ENOTSUP));

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

@@ -70,6 +70,10 @@ 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://test-xts-acts-Start-tests-from-onInit.patch;patchdir=${S}/test/xts/acts"
+SRC_URI += "file://RenderText-PerformLayout-remove-sigsegv-code.patch;patchdir=${S}/foundation/ace/ace_engine"
+SRC_URI += "file://remove-root-uid-check.patch;patchdir=${S}/foundation/aafwk/standard"
+
 inherit python3native gn_base ptest
 
 B = "${S}/out/ohos-arm-release"
@@ -309,7 +313,9 @@ OPENHARMONY_PARTS += "communication:ipc"
 OPENHARMONY_PARTS += "communication:ipc_js"
 OPENHARMONY_PARTS += "developtools:bytrace_standard"
 OPENHARMONY_PARTS += "developtools:hdc_standard"
+OPENHARMONY_PARTS += "distributeddatamgr:appdatamgr_jskits"
 OPENHARMONY_PARTS += "distributeddatamgr:distributeddatamgr"
+OPENHARMONY_PARTS += "distributeddatamgr:distributedfilejs"
 OPENHARMONY_PARTS += "distributeddatamgr:native_appdatamgr"
 OPENHARMONY_PARTS += "distributedhardware:device_manager_base"
 OPENHARMONY_PARTS += "distributedschedule:dmsfwk_standard"
@@ -816,9 +822,14 @@ FILES:${PN}-appdatamgr = " \
     ${libdir}/libnative_preferences*${SOLIBS} \
     ${libdir}/libnative_dataability*${SOLIBS} \
     ${libdir}/libnative_appdatafwk*${SOLIBS} \
+    ${libdir}/module/libfileio*${SOLIBS} \
+    ${libdir}/module/libfile*${SOLIBS} \
+    ${libdir}/module/data/librdb*${SOLIBS} \
+    ${libdir}/module/data/libstorage*${SOLIBS} \
+    ${libdir}/module/data/libdataability*${SOLIBS} \
 "
 RDEPENDS:${PN}-appdatamgr += "musl libcxx libcrypto"
-RDEPENDS:${PN}-appdatamgr += "${PN}-libutils ${PN}-ipc ${PN}-hilog ${PN}-thirdparty-libxml2 ${PN}-thirdparty-icu ${PN}-thirdparty-sqlite"
+RDEPENDS:${PN}-appdatamgr += "${PN}-libutils ${PN}-ipc ${PN}-hilog ${PN}-thirdparty-libxml2 ${PN}-thirdparty-icu ${PN}-thirdparty-sqlite ${PN}-ace-napi ${PN}-appexecfwk ${PN}-dmsfwk"
 RDEPENDS:${PN} += "${PN}-appdatamgr"
 
 PACKAGES =+ "${PN}-appdatamgr-ptest"