From 7b5e36c3049e56d11f5da33d3125026cfdc7910a Mon Sep 17 00:00:00 2001 From: s_c_c Date: Tue, 2 Jul 2024 16:51:11 +0800 Subject: [PATCH] Fix ObjectStore unused variable errors for embedded --- ...dded-fix-ObjectStore-unused-variable.patch | 25 +++++++++++++++++++ distributeddatamgr_data_object.spec | 7 +++++- distributeddataobject_impl.BUILD.gn | 2 -- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 0002-feat-for-embedded-fix-ObjectStore-unused-variable.patch diff --git a/0002-feat-for-embedded-fix-ObjectStore-unused-variable.patch b/0002-feat-for-embedded-fix-ObjectStore-unused-variable.patch new file mode 100644 index 0000000..a076d3c --- /dev/null +++ b/0002-feat-for-embedded-fix-ObjectStore-unused-variable.patch @@ -0,0 +1,25 @@ +From a94fa43233c0732811d6ab096eeb7232df591e28 Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Fri, 28 Jun 2024 11:11:18 +0800 +Subject: [PATCH] feat for embedded fix ObjectStore unused variable + +--- + interfaces/innerkits/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn +index 1f8b87d..0fcb165 100644 +--- a/interfaces/innerkits/BUILD.gn ++++ b/interfaces/innerkits/BUILD.gn +@@ -15,7 +15,7 @@ import("//build/ohos.gni") + config("objectstore_config") { + visibility = [ "//foundation/distributeddatamgr/data_object/interfaces/innerkits:*" ] + +- cflags = [ "-DHILOG_ENABLE" ] ++ cflags = [ "-DHILOG_ENABLE", "-Wno-unused-variable" ] + + include_dirs = [ + "../../frameworks/innerkitsimpl/include/adaptor", +-- +2.45.2.windows.1 + diff --git a/distributeddatamgr_data_object.spec b/distributeddatamgr_data_object.spec index fe6bb54..9a1029f 100644 --- a/distributeddatamgr_data_object.spec +++ b/distributeddatamgr_data_object.spec @@ -6,7 +6,7 @@ Name: distributeddatamgr_data_object Version: 1.0.0 -Release: 3 +Release: 4 Summary: Distributed Data Object Management Framework License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_data_object @@ -14,6 +14,7 @@ Source1: https://gitee.com/openharmony/distributeddatamgr_data_object/reposit Source2: distributeddataobject_impl.BUILD.gn Source3: bundle.json Patch1: 0001-Trim-the-dependencies-on-hitrace-libuv.patch +Patch2: 0002-feat-for-embedded-fix-ObjectStore-unused-variable.patch BuildRequires: libboundscheck BuildRequires: distributed-build, hilog, commonlibrary_c_utils @@ -53,6 +54,7 @@ fi mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/data_object %patch -P1 -p1 -d %{distributeddata_dir}data_object +%patch -P2 -p1 -d %{distributeddata_dir}data_object %build %ifarch x86_64 @@ -103,6 +105,9 @@ popd /system/* %changelog +* Fri Jun 28 2024 s_c_c - 1.0.0-4 +- Fix ObjectStore unused variable errors for embedded. + * Tue Nov 21 2023 Peng He - 1.0.0-3 - Update build requires and requires. diff --git a/distributeddataobject_impl.BUILD.gn b/distributeddataobject_impl.BUILD.gn index b4d5df3..5b03bd8 100644 --- a/distributeddataobject_impl.BUILD.gn +++ b/distributeddataobject_impl.BUILD.gn @@ -22,6 +22,4 @@ config("objectstore_public_config") { group("distributeddataobject_impl") { public_configs = [ ":objectstore_public_config" ] - part_name = "data_object" - subsystem_name = "distributeddatamgr" } -- Gitee