From dc7c55e3e0746655ec2f8168acfea35f9c603fe2 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Tue, 19 Apr 2022 15:11:34 +0800 Subject: [PATCH 1/2] meidia libaray dir change Signed-off-by: xianghengliang --- interfaces/kits/js/BUILD.gn | 2 +- services/BUILD.gn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index c9800ef9..213abd4e 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -44,7 +44,7 @@ ohos_shared_library("filemanager") { "$FMS_BASE_DIR:fms_server", "//foundation/ace/napi:ace_napi", "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js:fileio", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", + "//foundation/multimedia/medialibrary_standard/frameworks/services/media_library:medialibrary_data_ability", "//utils/native/base:utils", ] cflags = [] diff --git a/services/BUILD.gn b/services/BUILD.gn index 04a7a77c..da1d96e8 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -65,8 +65,8 @@ ohos_shared_library("fms_server") { "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/filemanagement/storage_service/interfaces/innerkits/storage_manager/native:storage_manager_sa_proxy", "//foundation/filemanagement/storage_service/services/storage_manager:storage_manager", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/media_library:media_library", - "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/medialibrary_data_ability:medialibrary_data_ability", + "//foundation/multimedia/medialibrary_standard/frameworks/innerkitsimpl/media_library_helper:media_library", + "//foundation/multimedia/medialibrary_standard/frameworks/services/media_library:medialibrary_data_ability", "//utils/native/base:utils", ] cflags = [] -- Gitee From 1b1862bd8516cca7af588d4de78a52a1e6070a36 Mon Sep 17 00:00:00 2001 From: xianghengliang Date: Wed, 20 Apr 2022 14:35:29 +0800 Subject: [PATCH 2/2] media library test fix Signed-off-by: xianghengliang --- interfaces/kits/js/BUILD.gn | 2 +- services/test/BUILD.gn | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 213abd4e..281e71a9 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("filemanager") { "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common/napi/n_async", "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common/napi", "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/interfaces/inner_api/media_library_helper/include", ] sources = [ diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 489e7167..cc26b921 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("file_manager_proxy_test") { "$FMS_BASE_DIR/src/fileoper", "//third_party/googletest/googlemock/include/gmock", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/interfaces/inner_api/media_library_helper/include", ] configs = [ "//build/config/compiler:exceptions" ] @@ -59,7 +59,7 @@ ohos_unittest("oper_factory_test") { "$FMS_BASE_DIR/src/client", "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/interfaces/inner_api/media_library_helper/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", ] @@ -93,7 +93,7 @@ ohos_unittest("file_manager_service_test") { "$FMS_BASE_DIR/src/client", "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", - "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", + "//foundation/multimedia/medialibrary_standard/interfaces/inner_api/media_library_helper/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", ] -- Gitee