From 77c15047783760d715af740124a774d04c7990e9 Mon Sep 17 00:00:00 2001 From: dongsenhao Date: Tue, 13 Jun 2023 14:31:29 +0800 Subject: [PATCH] Compilation and construction standardization rectification Signed-off-by: dongsenhao --- bundle.json | 14 +++++++++----- purgeable_builder/BUILD.gn | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index 0de7244..3ff4790 100644 --- a/bundle.json +++ b/bundle.json @@ -19,15 +19,19 @@ "deps": { "components": [ "c_utils", - "drivers_interface_memorytracker", - "hiviewdfx_hilog_native" + "drivers_interface_memorytracker", + "hiviewdfx_hilog_native", + "hitrace_native", + "init", + "ipc", + "multimedia_image_framework" ], "third_party": [] }, "build": { "sub_component": [ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", - "//commonlibrary/memory_utils/libmeminfo:libmeminfo", + "//commonlibrary/memory_utils/libmeminfo:libmeminfo", "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem", "//commonlibrary/memory_utils/libpurgeablemem:purgeable_memory_ndk", "//commonlibrary/memory_utils/purgeable_builder:pixelmap_builder" @@ -42,7 +46,7 @@ "header_base": "//commonlibrary/memory_utils/libdmabufheap/include" } }, - { + { "name": "//commonlibrary/memory_utils/libmeminfo:libmeminfo", "header": { "header_files": [ @@ -78,7 +82,7 @@ ], "test": [ "//commonlibrary/memory_utils/libdmabufheap/test:unittest", - "//commonlibrary/memory_utils/libmeminfo/test:libmeminfo_test", + "//commonlibrary/memory_utils/libmeminfo/test:libmeminfo_test", "//commonlibrary/memory_utils/libpurgeablemem/test:libpurgeablemem_test" ] } diff --git a/purgeable_builder/BUILD.gn b/purgeable_builder/BUILD.gn index bde6d92..80ac49b 100644 --- a/purgeable_builder/BUILD.gn +++ b/purgeable_builder/BUILD.gn @@ -30,12 +30,12 @@ ohos_shared_library("pixelmap_builder") { defines += [ "IMAGE_PURGEABLE_PIXELMAP" ] } + deps = [ "../libpurgeablemem:libpurgeablemem" ] external_deps = [ "c_utils:utils", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "memory_utils:libpurgeablemem", "multimedia_image_framework:image", "multimedia_image_framework:image_native", ] -- Gitee