From 312c51f4838cc7ce15542261f448b09d7fe56689 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@geanix.com>
Date: Thu, 23 Mar 2023 10:51:03 +0100
Subject: [PATCH] openharmony-standard: Drop patch disabling graphics rendering
Graphics seems to be basically working now, both on QEMU and rpi4 (plus/minus a
few quirks). This patch is now causing more problems than it is solving, so
let's revert it for now.
We need to take care that slow rendering is handled properly. We might have
more test cases failing due to this after dropping this patch.
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
.../ace_engine-disable-create-component.patch | 29 -------------------
.../openharmony/openharmony-standard_3.0.bb | 1 -
2 files changed, 30 deletions(-)
delete mode 100644 recipes-openharmony/openharmony/openharmony-standard-3.0/ace_engine-disable-create-component.patch
diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/ace_engine-disable-create-component.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/ace_engine-disable-create-component.patch
deleted file mode 100644
index 1197b214..00000000
--- a/recipes-openharmony/openharmony/openharmony-standard-3.0/ace_engine-disable-create-component.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-foundation/ace/ace_engine: disable graphics
-
-The graphics rendering is slowing the system making some ACTS test suites to timeout.
-Since we are aiming for certification for headless system, graphics stack
-should not be required.
-Disabling graphics by skipping JSView::CreateComponent() execution.
-In the future we will remove this patch when we the graphical part will be needed.
-
-Apply to foundation/ace/ace_engine
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
-diff --git a/frameworks/bridge/declarative_frontend/jsview/js_view.cpp b/frameworks/bridge/declarative_frontend/jsview/js_view.cpp
-index e455cb00..d58d5c79 100644
---- a/frameworks/bridge/declarative_frontend/jsview/js_view.cpp
-+++ b/frameworks/bridge/declarative_frontend/jsview/js_view.cpp
-@@ -254,6 +254,7 @@ RefPtr<OHOS::Ace::Component> JSView::CreateComponent()
-
- std::string key = ViewStackProcessor::GetInstance()->ProcessViewId(viewId_);
- auto composedComponent = AceType::MakeRefPtr<ComposedComponent>(key, "view");
-+ return composedComponent;
-
- // add callback for element creation to component, and get pointer reference
- // to the element on creation. When state of this view changes, mark the
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
index 42847eb9..dbf7c0f9 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
+++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
@@ -99,7 +99,6 @@ SRC_URI += "file://test-xts-acts-start-ability-timeout-increment.patch;patchdir=
SRC_URI += "file://test-xts-acts-fix-Defpermission-typo.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://test-xts-acts-fix-faultloggertest.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://test-xts-acts-fix-hicolliecpptest.patch;patchdir=${S}/test/xts/acts"
-SRC_URI += "file://ace_engine-disable-create-component.patch;patchdir=${S}/foundation/ace/ace_engine"
SRC_URI += "file://test-xts-acts-increase-testsuite-timeouts.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://actsgetwantalltest-wait-between-testcases.patch;patchdir=${S}/test/xts/acts"
SRC_URI += "file://actsfeatureabilitytest-wait-between-testcases.patch;patchdir=${S}/test/xts/acts"
--
GitLab