diff --git a/bundle.json b/bundle.json index c1f5f6dc2427cb86660433bf7aa28c4bd3b29a7f..e56631a9016284b66a9ca9943a768fb33603aba8 100644 --- a/bundle.json +++ b/bundle.json @@ -26,7 +26,26 @@ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem" ], - "inner_kits": [], + "inner_kits": [ + { + "name": "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap", + "header": { + "header_files": [ + "dmabuf_alloc.h" + ], + "header_base": "//commonlibrary/memory_utils/libdmabufheap/include" + } + }, + { + "name": "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem", + "header": { + "header_files": [ + "purgeable_mem_c.h" + ], + "header_base": "//commonlibrary/memory_utils/libpurgeablemem/c/include" + } + } + ], "test": [ "//commonlibrary/memory_utils/libdmabufheap/test:unittest", "//commonlibrary/memory_utils/libpurgeablemem/test:libpurgeablemem_test" diff --git a/libdmabufheap/test/BUILD.gn b/libdmabufheap/test/BUILD.gn index 55dad046c7dae372ba7d8baf00d0526f77d13fd4..40c17394d39101713da6591efa64b2450bc0b3dd 100644 --- a/libdmabufheap/test/BUILD.gn +++ b/libdmabufheap/test/BUILD.gn @@ -18,8 +18,10 @@ module_output_path = "libdmabufheap/" ohos_unittest("DmabufAllocTest") { module_out_path = module_output_path sources = [ "unittest/libdmabufheap/dmabuf_alloc_test.cpp" ] - deps = [ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "memory_utils:libdmabufheap", + ] } group("unittest") { diff --git a/libpurgeablemem/test/BUILD.gn b/libpurgeablemem/test/BUILD.gn index 19b8474619d85e790fb91148a061cfbe417d2b9b..d9288e4f50407dee8bb2997aa380f14e896b0790 100644 --- a/libpurgeablemem/test/BUILD.gn +++ b/libpurgeablemem/test/BUILD.gn @@ -17,14 +17,10 @@ import("//build/test.gni") module_output_path = "libpurgeablemem/" -purgeable_deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem", -] - purgeable_external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", + "memory_utils:libpurgeablemem", ] purgeable_public_deps = [ "//third_party/googletest:gtest_main" ] @@ -32,7 +28,6 @@ purgeable_public_deps = [ "//third_party/googletest:gtest_main" ] ohos_unittest("purgeable_c_test") { module_out_path = module_output_path sources = [ "purgeable_c_test.cpp" ] - deps = purgeable_deps if (is_standard_system) { external_deps = purgeable_external_deps public_deps = purgeable_public_deps @@ -45,7 +40,6 @@ ohos_unittest("purgeable_c_test") { ohos_unittest("purgeable_cpp_test") { module_out_path = module_output_path sources = [ "purgeable_cpp_test.cpp" ] - deps = purgeable_deps if (is_standard_system) { external_deps = purgeable_external_deps public_deps = purgeable_public_deps @@ -58,7 +52,6 @@ ohos_unittest("purgeable_cpp_test") { ohos_unittest("purgeableashmem_test") { module_out_path = module_output_path sources = [ "purgeableashmem_test.cpp" ] - deps = purgeable_deps if (is_standard_system) { external_deps = purgeable_external_deps public_deps = purgeable_public_deps