openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 17:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Memory monitor support

Browse Source 
Signed-off-by: Far <yesiyuan2@huawei.com>
Change-Id: Iebd219dd5e02c1d70e7bc5aa676093510672bca6
This commit is contained in:
Far 2023-03-02 22:23:17 +08:00
parent da1524a5b4
commit 6b29ae34af
72 changed files with 142 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ace_config.gni
View File

@ -141,7 +141,6 @@ if (is_standard_system) {
ace_wearable_defines = [ "WEARABLE_PRODUCT" ]
ace_ivi_defines = [ "IVI_PRODUCT" ]
# memory flag: [ "ACE_MEMORY_MONITOR" ]
ace_common_defines = [ "ACE_LOG_TAG=\"Ace\"" ]
if (enable_glfw_window) {

5
adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn
View File

@ -98,7 +98,10 @@ template("js_pa_engine_ark") {
defines += [ "PA_SUPPORT" ]
deps += [ ":gen_obj_src_abc_proxyclass" ]
deps += [
":gen_obj_src_abc_proxyclass",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
]
if (target_cpu == "arm64") {
defines += [ "APP_USE_ARM64" ]

35
adapter/ohos/osal/system_properties.cpp
View File

@ -247,6 +247,11 @@ int32_t GetAstcPsnrProp()
return system::GetIntParameter<int>("persist.astc.psnr", 0);
}
bool IsUseMemoryMonitor()
{
return (system::GetParameter("persist.ace.memorymonitor.enabled", "0") == "1");
}
bool IsExtSurfaceEnabled()
{
#ifdef EXT_SURFACE_ENABLE
@ -263,9 +268,9 @@ bool SystemProperties::isRound_ = false;
bool SystemProperties::isDeviceAccess_ = false;
int32_t SystemProperties::deviceWidth_ = 0;
int32_t SystemProperties::deviceHeight_ = 0;
double SystemProperties::resolution_ = 1.0;
DeviceType SystemProperties::deviceType_ { DeviceType::UNKNOWN };
DeviceOrientation SystemProperties::orientation_ { DeviceOrientation::PORTRAIT };
ACE_WEAK_SYM double SystemProperties::resolution_ = 1.0;
ACE_WEAK_SYM DeviceType SystemProperties::deviceType_ { DeviceType::UNKNOWN };
ACE_WEAK_SYM DeviceOrientation SystemProperties::orientation_ { DeviceOrientation::PORTRAIT };
std::string SystemProperties::brand_ = INVALID_PARAM;
std::string SystemProperties::manufacturer_ = INVALID_PARAM;
std::string SystemProperties::model_ = INVALID_PARAM;
@ -279,19 +284,19 @@ ColorMode SystemProperties::colorMode_ { ColorMode::LIGHT };
ScreenShape SystemProperties::screenShape_ { ScreenShape::NOT_ROUND };
LongScreenType SystemProperties::LongScreen_ { LongScreenType::NOT_LONG };
bool SystemProperties::unZipHap_ = true;
bool SystemProperties::rosenBackendEnabled_ = IsRosenBackendEnabled();
bool SystemProperties::isHookModeEnabled_ = IsHookModeEnabled();
ACE_WEAK_SYM bool SystemProperties::rosenBackendEnabled_ = IsRosenBackendEnabled();
ACE_WEAK_SYM bool SystemProperties::isHookModeEnabled_ = IsHookModeEnabled();
bool SystemProperties::debugBoundaryEnabled_ = IsDebugBoundaryEnabled();
bool SystemProperties::windowAnimationEnabled_ = IsWindowAnimationEnabled();
ACE_WEAK_SYM bool SystemProperties::windowAnimationEnabled_ = IsWindowAnimationEnabled();
bool SystemProperties::debugEnabled_ = IsDebugEnabled();
bool SystemProperties::gpuUploadEnabled_ = IsGpuUploadEnabled();
bool SystemProperties::astcEnabled_ = GetAstcEnabled();
int32_t SystemProperties::astcMax_ = GetAstcMaxErrorProp();
int32_t SystemProperties::astcPsnr_ = GetAstcPsnrProp();
bool SystemProperties::extSurfaceEnabled_ = IsExtSurfaceEnabled();
uint32_t SystemProperties::dumpFrameCount_ = GetSysDumpFrameCount();
ACE_WEAK_SYM bool SystemProperties::extSurfaceEnabled_ = IsExtSurfaceEnabled();
ACE_WEAK_SYM uint32_t SystemProperties::dumpFrameCount_ = GetSysDumpFrameCount();
DeviceType SystemProperties::GetDeviceType()
ACE_WEAK_SYM DeviceType SystemProperties::GetDeviceType()
{
InitDeviceTypeBySystemProperty();
return deviceType_;
@ -367,7 +372,7 @@ void SystemProperties::SetDeviceOrientation(int32_t orientation)
}
}
float SystemProperties::GetFontWeightScale()
ACE_WEAK_SYM float SystemProperties::GetFontWeightScale()
{
// Default value of font weight scale is 1.0.
std::string prop =
@ -381,7 +386,7 @@ void SystemProperties::InitMccMnc(int32_t mcc, int32_t mnc)
mnc_ = mnc;
}
bool SystemProperties::GetDebugEnabled()
ACE_WEAK_SYM bool SystemProperties::GetDebugEnabled()
{
return debugEnabled_;
}
@ -401,7 +406,7 @@ std::string SystemProperties::GetNewPipePkg()
return system::GetParameter("persist.ace.newpipe.pkgname", "");
}
float SystemProperties::GetAnimationScale()
ACE_WEAK_SYM float SystemProperties::GetAnimationScale()
{
std::shared_lock<std::shared_mutex> lock(mutex_);
return animationScale_;
@ -422,4 +427,10 @@ bool SystemProperties::GetAllowWindowOpenMethodEnabled()
return system::GetBoolParameter("persist.web.allowWindowOpenMethod.enabled", false);
}
bool SystemProperties::GetIsUseMemoryMonitor()
{
static bool isUseMemoryMonitor = IsUseMemoryMonitor();
return isUseMemoryMonitor;
}
} // namespace OHOS::Ace

2
adapter/preview/osal/pixel_map_preview.h
View File

@ -20,7 +20,7 @@
namespace OHOS::Ace {
class PixelMapPreview : public PixelMap {
DECLARE_ACE_TYPE(PixelMapOhos, PixelMap)
DECLARE_ACE_TYPE(PixelMapPreview, PixelMap)
public:
static RefPtr<PixelMap> CreatePixelMap(void* sptrAddr);

4
adapter/preview/osal/system_properties.cpp
View File

@ -197,4 +197,8 @@ int32_t SystemProperties::GetSvgMode()
return 1;
}
bool SystemProperties::GetIsUseMemoryMonitor()
{
return false;
}
} // namespace OHOS::Ace

2
build/libace.map
View File

@ -65,6 +65,8 @@
OHOS::Ace::SystemProperties::*;
OHOS::Ace::ThemeConstants::*;
OHOS::Ace::UIContentImpl::*;
OHOS::Ace::MemoryMonitor::*;
OHOS::Ace::DumpLog::*;
virtual?thunk?to?OHOS::Ace::Animator::~Animator??;

24
frameworks/base/BUILD.gn
View File

@ -111,4 +111,28 @@ foreach(item, ace_platforms) {
cflags_cc = config.cflags_cc
}
}
ohos_source_set("ace_memory_monitor_" + item.name) {
platform = item.name
configs = [ "$ace_root:ace_config" ]
sources = [
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/memory/memory_monitor.cpp",
]
if (platform == "windows" || platform == "mac" || platform == "linux") {
sources += [ "$ace_root/adapter/preview/osal/system_properties.cpp" ]
} else {
sources += [ "$ace_root/adapter/$platform/osal/system_properties.cpp" ]
}
if (platform == "ohos") {
external_deps = [
"init:libbeget_proxy",
"init:libbegetutil",
]
}
}
}

9
frameworks/base/memory/memory_monitor.cpp
View File

@ -24,6 +24,7 @@
#include "base/log/dump_log.h"
#include "base/log/log.h"
#include "base/utils/system_properties.h"
namespace OHOS::Ace {
@ -36,7 +37,8 @@ void PurgeMallocCache()
#endif
}
#ifdef ACE_MEMORY_MONITOR
bool MemoryMonitor::isEnable_ = SystemProperties::GetIsUseMemoryMonitor();
class MemoryMonitorImpl : public MemoryMonitor {
public:
void Add(void* ptr) final
@ -90,6 +92,10 @@ public:
void Dump() const final
{
if (!IsEnable()) {
DumpLog::GetInstance().Print(0, "Set `persist.ace.memorymonitor.enabled = 1` to enable this feature");
return;
}
std::lock_guard<std::mutex> lock(mutex_);
std::string out = "total = " + std::to_string(total_) + ", count = " + std::to_string(count_);
DumpLog::GetInstance().Print(0, out);
@ -126,6 +132,5 @@ MemoryMonitor& MemoryMonitor::GetInstance()
static MemoryMonitorImpl instance;
return instance;
}
#endif // ACE_MEMORY_MONITOR
} // namespace OHOS::Ace

11
frameworks/base/memory/memory_monitor.h
View File

@ -26,8 +26,7 @@ namespace OHOS::Ace {
void PurgeMallocCache();
#ifdef ACE_MEMORY_MONITOR
class ACE_FORCE_EXPORT MemoryMonitor {
class ACE_FORCE_EXPORT_WITH_PREVIEW MemoryMonitor {
public:
static MemoryMonitor& GetInstance();
@ -46,6 +45,11 @@ public:
}
}
static bool IsEnable()
{
return isEnable_;
}
private:
template<class T, bool hasTypeInfo = std::is_base_of_v<TypeInfoBase, T>>
struct TypeInfo;
@ -75,9 +79,8 @@ private:
return TypeInfoHelper::TypeSize(rawPtr);
}
};
static bool isEnable_;
};
#endif // ACE_MEMORY_MONITOR
} // namespace OHOS::Ace
#endif // FOUNDATION_ACE_FRAMEWORKS_BASE_MEMORY_MEMORY_MONITOR_H

11
frameworks/base/memory/memory_monitor_def.h
View File

@ -20,11 +20,7 @@
#include "base/utils/macros.h"
#ifdef ACE_DEBUG
#define ACE_MEMORY_MONITOR
#endif
#ifdef ACE_MEMORY_MONITOR
#define VERIFY_CLASSNAME(classname, p) \
VerifyClass<std::is_same_v<classname, std::remove_cv_t<std::remove_pointer_t<decltype(p)>>>>::Success()
@ -56,11 +52,4 @@ struct VerifyClass<true> {
};
} // namespace OHOS::Ace
#else // ACE_MEMORY_MONITOR
#define DECLARE_CLASS_TYPE_SIZE(classname)
#define DECLARE_CLASS_GET_TYPE_SIZE(classname)
#define VERIFY_DECLARED_CLASS(classname)
#endif // ACE_MEMORY_MONITOR
#endif // FOUNDATION_ACE_FRAMEWORKS_BASE_MEMORY_MEMORY_MONITOR_DEF_H

21
frameworks/base/memory/referenced.h
View File

@ -38,9 +38,9 @@ public:
template<class T>
static RefPtr<T> Claim(T* rawPtr)
{
#ifdef ACE_MEMORY_MONITOR
MemoryMonitor::GetInstance().Update(rawPtr, static_cast<Referenced*>(rawPtr));
#endif
if (MemoryMonitor::IsEnable()) {
MemoryMonitor::GetInstance().Update(rawPtr, static_cast<Referenced*>(rawPtr));
}
return RefPtr<T>(rawPtr);
}
template<class T>
@ -77,20 +77,19 @@ public:
}
return refCount;
}
#ifdef ACE_MEMORY_MONITOR
int32_t RefCount() const
{
return refCounter_->StrongRefCount();
}
#endif
protected:
explicit Referenced(bool threadSafe = true)
: refCounter_(threadSafe ? ThreadSafeRef::Create() : ThreadUnsafeRef::Create())
{
#ifdef ACE_MEMORY_MONITOR
MemoryMonitor::GetInstance().Add(this);
#endif
if (MemoryMonitor::IsEnable()) {
MemoryMonitor::GetInstance().Add(this);
}
}
virtual ~Referenced()
@ -98,9 +97,9 @@ protected:
// Decrease weak reference count held by 'Referenced' itself.
refCounter_->DecWeakRef();
refCounter_ = nullptr;
#ifdef ACE_MEMORY_MONITOR
MemoryMonitor::GetInstance().Remove(this);
#endif
if (MemoryMonitor::IsEnable()) {
MemoryMonitor::GetInstance().Remove(this);
}
}
virtual bool MaybeRelease()

4
frameworks/base/memory/type_info_base.h
View File

@ -84,9 +84,7 @@ protected:
virtual IdType GetTypeId() const = 0;
virtual const char* GetTypeName() const = 0;
#ifdef ACE_MEMORY_MONITOR
virtual size_t GetTypeSize() const { return 0; }
#endif // ACE_MEMORY_MONITOR
};
class TypeInfoHelper final {
@ -126,7 +124,6 @@ public:
{
return TypeName(&instance);
}
#ifdef ACE_MEMORY_MONITOR
static size_t TypeSize(const TypeInfoBase* rawPtr)
{
return rawPtr != nullptr ? rawPtr->GetTypeSize() : 0;
@ -135,7 +132,6 @@ public:
{
return TypeSize(&instance);
}
#endif
// Get type info by type itself.
template<class T>

1
frameworks/base/utils/macros.h
View File

@ -17,6 +17,7 @@
#define FOUNDATION_ACE_FRAMEWORKS_BASE_UTILS_MACROS_H
#define ACE_FORCE_EXPORT __attribute__((visibility("default")))
#define ACE_WEAK_SYM __attribute__((weak))
#ifndef ACE_EXPORT
#ifndef HIDDEN_SYMBOL

1
frameworks/base/utils/system_properties.h
View File

@ -335,6 +335,7 @@ public:
{
return dumpFrameCount_;
}
static bool GetIsUseMemoryMonitor();
private:
static bool traceEnabled_;

2
frameworks/core/components_ng/base/modifier.h
View File

@ -73,7 +73,7 @@ struct DrawingContext {
template<typename T>
class NormalProperty : public PropertyBase {
DECLARE_ACE_TYPE(Property, PropertyBase);
DECLARE_ACE_TYPE(NormalProperty, PropertyBase);
public:
explicit NormalProperty(const T& value) : value_(value) {}

2
frameworks/core/components_ng/test/base/frame_node/BUILD.gn
View File

@ -21,7 +21,6 @@ ohos_unittest("frame_node_test_ng") {
# old
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -77,6 +76,7 @@ ohos_unittest("frame_node_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/base/geometry_node/BUILD.gn
View File

@ -20,7 +20,6 @@ ohos_unittest("geometry_node_test_ng") {
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -76,6 +75,7 @@ ohos_unittest("geometry_node_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/base/inspector/BUILD.gn
View File

@ -20,7 +20,6 @@ ohos_unittest("inspector_test_ng") {
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -77,6 +76,7 @@ ohos_unittest("inspector_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/base/ui_node/BUILD.gn
View File

@ -20,7 +20,6 @@ ohos_unittest("ui_node_test_ng") {
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -76,6 +75,7 @@ ohos_unittest("ui_node_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/base/view_stack_processor/BUILD.gn
View File

@ -20,7 +20,6 @@ ohos_unittest("view_stack_processor_test_ng") {
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -76,6 +75,7 @@ ohos_unittest("view_stack_processor_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/click_event/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("click_event_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -63,6 +62,7 @@ ohos_unittest("click_event_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/drag_event/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("drag_event_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
@ -64,6 +63,7 @@ ohos_unittest("drag_event_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/event_hub/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("event_hub_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -62,6 +61,7 @@ ohos_unittest("event_hub_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/focus_hub/BUILD.gn
View File

@ -21,7 +21,6 @@ ohos_unittest("focus_hub_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -65,6 +64,7 @@ ohos_unittest("focus_hub_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/gesture_event_hub/BUILD.gn
View File

@ -31,7 +31,6 @@ ohos_unittest("gesture_event_hub_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
@ -84,6 +83,7 @@ ohos_unittest("gesture_event_hub_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/input_event_hub/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("input_event_hub_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -61,6 +60,7 @@ ohos_unittest("input_event_hub_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/long_press_event/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("long_press_event_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -63,6 +62,7 @@ ohos_unittest("long_press_event_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/pan_event/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("pan_event_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
@ -64,6 +63,7 @@ ohos_unittest("pan_event_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/scrollable_event/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("scrollable_event_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
@ -65,6 +64,7 @@ ohos_unittest("scrollable_event_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/event/touch_event/BUILD.gn
View File

@ -24,7 +24,6 @@ ohos_unittest("touch_event_test_ng") {
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
@ -60,6 +59,7 @@ ohos_unittest("touch_event_test_ng") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]

1
frameworks/core/components_ng/test/manager/drag_drop/drag_drop_manager/BUILD.gn
View File

@ -77,6 +77,7 @@ ohos_unittest("drag_drop_manager_test_ng") {
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_src",

1
frameworks/core/components_ng/test/manager/drag_drop/drag_drop_proxy/BUILD.gn
View File

@ -64,6 +64,7 @@ ohos_unittest("drag_drop_proxy_test_ng") {
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",

1
frameworks/core/components_ng/test/manager/full_screen/BUILD.gn
View File

@ -49,6 +49,7 @@ ohos_unittest("full_screen_manager_test_ng") {
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]

1
frameworks/core/components_ng/test/manager/select_overlay/select_overlay_manager/BUILD.gn
View File

@ -60,6 +60,7 @@ ohos_unittest("select_overlay_manager_test_ng") {
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",

1
frameworks/core/components_ng/test/manager/select_overlay/select_overlay_proxy/BUILD.gn
View File

@ -60,6 +60,7 @@ ohos_unittest("select_overlay_proxy_test_ng") {
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",

2
frameworks/core/components_ng/test/manager/shared_overlay/BUILD.gn
View File

@ -47,7 +47,6 @@ ohos_unittest("shared_overlay_manager_test_ng") {
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/components/common/properties/test/mock/mock_motion_path_evaluator.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_dump_log.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_input_event_hub.cpp",
@ -65,6 +64,7 @@ ohos_unittest("shared_overlay_manager_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/ability_component/BUILD.gn
View File

@ -41,7 +41,6 @@ ohos_unittest("ability_component_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
@ -99,6 +98,7 @@ ohos_unittest("ability_component_pattern_test_ng") {
]
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",

2
frameworks/core/components_ng/test/pattern/checkbox/BUILD.gn
View File

@ -25,7 +25,6 @@ ohos_unittest("checkbox_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -122,6 +121,7 @@ ohos_unittest("checkbox_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

2
frameworks/core/components_ng/test/pattern/checkboxgroup/BUILD.gn
View File

@ -25,7 +25,6 @@ ohos_unittest("checkboxgroup_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -122,6 +121,7 @@ ohos_unittest("checkboxgroup_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

2
frameworks/core/components_ng/test/pattern/container_modal/BUILD.gn
View File

@ -51,7 +51,6 @@ ohos_unittest("container_modal_test_ng") {
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/ace_trace.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -198,6 +197,7 @@ ohos_unittest("container_modal_test_ng") {
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",

2
frameworks/core/components_ng/test/pattern/counter/BUILD.gn
View File

@ -100,7 +100,6 @@ ohos_unittest("counter_pattern_test_ng") {
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_dump_log.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
@ -123,6 +122,7 @@ ohos_unittest("counter_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

1
frameworks/core/components_ng/test/pattern/image_animator/BUILD.gn
View File

@ -77,6 +77,7 @@ ohos_unittest("image_animator_pattern_test") {
deps = [
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/linear_layout/BUILD.gn
View File

@ -21,7 +21,6 @@ ohos_unittest("linear_layout_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -97,6 +96,7 @@ ohos_unittest("linear_layout_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

3
frameworks/core/components_ng/test/pattern/list/BUILD.gn
View File

@ -18,7 +18,6 @@ common_sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
@ -161,6 +160,7 @@ ohos_unittest("list_pattern_test_ng") {
sources = test_sources + common_sources
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",
@ -178,6 +178,7 @@ ohos_unittest("list_test_ng") {
sources = common_sources + test_sources
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

2
frameworks/core/components_ng/test/pattern/loading_progress/BUILD.gn
View File

@ -26,7 +26,6 @@ ohos_unittest("loading_progress_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
@ -104,6 +103,7 @@ ohos_unittest("loading_progress_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/menu/BUILD.gn
View File

@ -122,7 +122,6 @@ ohos_unittest("menu_layout_algorithm_test_ng") {
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/mock_icon_theme.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_dump_log.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
@ -155,6 +154,7 @@ ohos_unittest("menu_layout_algorithm_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

2
frameworks/core/components_ng/test/pattern/navigation/BUILD.gn
View File

@ -53,7 +53,6 @@ ohos_unittest("navigation_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/ace_trace.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -230,6 +229,7 @@ ohos_unittest("navigation_pattern_test_ng") {
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",

3
frameworks/core/components_ng/test/pattern/option/BUILD.gn
View File

@ -35,8 +35,6 @@ ohos_unittest("panel_option_test_ng") {
"$ace_root/frameworks/base/geometry/animatable_dimension.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/memory/memory_monitor.cpp",
"$ace_root/frameworks/base/thread/background_task_executor.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -89,6 +87,7 @@ ohos_unittest("panel_option_test_ng") {
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/patternlock/BUILD.gn
View File

@ -25,7 +25,6 @@ ohos_unittest("patternlock_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -117,6 +116,7 @@ ohos_unittest("patternlock_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/picker/BUILD.gn
View File

@ -50,7 +50,6 @@ ohos_unittest("picker_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -184,6 +183,7 @@ ohos_unittest("picker_pattern_test_ng") {
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/progress/BUILD.gn
View File

@ -26,7 +26,6 @@ ohos_unittest("progress_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -102,6 +101,7 @@ ohos_unittest("progress_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/qrcode/BUILD.gn
View File

@ -26,7 +26,6 @@ ohos_unittest("qrcode_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -99,6 +98,7 @@ ohos_unittest("qrcode_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/radio/BUILD.gn
View File

@ -25,7 +25,6 @@ ohos_unittest("radio_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -117,6 +116,7 @@ ohos_unittest("radio_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/rating/BUILD.gn
View File

@ -34,7 +34,6 @@ ohos_unittest("rating_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/core/animation/anticipate_curve.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
@ -118,6 +117,7 @@ ohos_unittest("rating_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/refresh/BUILD.gn
View File

@ -49,7 +49,6 @@ ohos_unittest("refresh_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -177,6 +176,7 @@ ohos_unittest("refresh_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/select/BUILD.gn
View File

@ -121,7 +121,6 @@ ohos_unittest("select_pattern_test_ng") {
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/mock_icon_theme.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_dump_log.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
@ -151,6 +150,7 @@ ohos_unittest("select_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

2
frameworks/core/components_ng/test/pattern/slider/BUILD.gn
View File

@ -36,7 +36,6 @@ ohos_unittest("slider_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
@ -154,6 +153,7 @@ ohos_unittest("slider_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/swiper/BUILD.gn
View File

@ -24,7 +24,6 @@ ohos_unittest("swiper_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -129,6 +128,7 @@ ohos_unittest("swiper_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/text/BUILD.gn
View File

@ -53,7 +53,6 @@ ohos_unittest("text_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/ace_trace.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -180,6 +179,7 @@ ohos_unittest("text_pattern_test_ng") {
deps = [
"$ace_flutter_engine_root:third_party_flutter_engine_ohos",
"$ace_flutter_engine_root/skia:ace_skia_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",

1
frameworks/core/components_ng/test/pattern/text_clock/BUILD.gn
View File

@ -68,6 +68,7 @@ ohos_unittest("text_clock_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_src",

1
frameworks/core/components_ng/test/pattern/texttimer/BUILD.gn
View File

@ -68,6 +68,7 @@ ohos_unittest("text_timer_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_src",

2
frameworks/core/components_ng/test/pattern/toggle/BUILD.gn
View File

@ -26,7 +26,6 @@ ohos_unittest("toggle_pattern_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
@ -123,6 +122,7 @@ ohos_unittest("toggle_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/pattern/video/BUILD.gn
View File

@ -49,7 +49,6 @@ ohos_unittest("video_pattern_test_ng") {
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/ressched/ressched_report.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
@ -193,6 +192,7 @@ ohos_unittest("video_pattern_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/syntax/for_each/BUILD.gn
View File

@ -36,7 +36,6 @@ ohos_unittest("for_each_syntax_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -104,6 +103,7 @@ ohos_unittest("for_each_syntax_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/syntax/if_else/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("if_else_syntax_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
@ -94,6 +93,7 @@ ohos_unittest("if_else_syntax_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/components_ng/test/syntax/lazy_for_each/BUILD.gn
View File

@ -23,7 +23,6 @@ ohos_unittest("lazy_for_each_syntax_test_ng") {
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
@ -96,6 +95,7 @@ ohos_unittest("lazy_for_each_syntax_test_ng") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",

2
frameworks/core/pipeline/pipeline_base.cpp
View File

@ -387,12 +387,10 @@ bool PipelineBase::Dump(const std::vector<std::string>& params) const
return false;
}
// the first param is the key word of dump.
#ifdef ACE_MEMORY_MONITOR
if (params[0] == "-memory") {
MemoryMonitor::GetInstance().Dump();
return true;
}
#endif
if (params[0] == "-jscrash") {
EventReport::JsErrReport(
AceApplicationInfo::GetInstance().GetPackageName(), "js crash reason", "js crash summary");

2
frameworks/core/pipeline_ng/test/mock/mock_pipeline_context.cpp
View File

@ -36,7 +36,7 @@ class ManagerInterface : public AceType {
};
class OffscreenCanvas : public AceType {
DECLARE_ACE_TYPE(Frontend, AceType);
DECLARE_ACE_TYPE(OffscreenCanvas, AceType);
};
} // namespace OHOS::Ace
namespace OHOS::Ace::NG {

2
test/fuzztest/util_fuzzer/BUILD.gn
View File

@ -33,7 +33,6 @@ ohos_fuzztest("UtilFuzzTest") {
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/bridge/common/utils/source_map.cpp",
"//third_party/cJSON/cJSON.c",
"util_fuzzer.cpp",
@ -46,6 +45,7 @@ ohos_fuzztest("UtilFuzzTest") {
"$ace_root",
cjson_root,
]
deps = [ "$ace_root/frameworks/base:ace_memory_monitor_ohos" ]
external_deps = [
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",

2
test/fuzztest/utilmost_fuzzer/BUILD.gn
View File

@ -34,7 +34,6 @@ ohos_fuzztest("UtilMostFuzzTest") {
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/bridge/common/dom/dom_type.cpp",
#"$ace_root/frameworks/base/utils/resource_configuration.cpp",
@ -65,6 +64,7 @@ ohos_fuzztest("UtilMostFuzzTest") {
defines = [ "FUZZTEST" ]
deps = [
#"$ace_root/adapter/ohos/osal:ace_osal_ohos",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"//foundation/window/window_manager/utils:libwmutil",
"//foundation/window/window_manager/wm:libwm",
"//third_party/icu/icu4c:shared_icui18n",

2
test/unittest/ace_unittest.gni
View File

@ -92,7 +92,6 @@ test_pattern_sources = [
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/ace_trace_mock.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_dump_log.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
@ -108,6 +107,7 @@ test_pattern_sources = [
]
test_pattern_deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/frameworks/core/components/theme:build_theme_code",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",

1
test/unittest/base/geometry/BUILD.gn
View File

@ -55,6 +55,7 @@ ohos_unittest("geometry_test") {
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson_static",
"//third_party/googletest:gmock_main",