From 9252d341bd0757c233a9dcb7bdaad7cbd5251dc8 Mon Sep 17 00:00:00 2001 From: zhouyan Date: Tue, 12 Jul 2022 17:39:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86database=E4=BB=8Efwk=E7=A7=BB=E5=88=B0?= =?UTF-8?q?service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyan Change-Id: I75ca29d694adb23f43b9b035aedd4dd0184e753c --- services/accesstokenmanager/BUILD.gn | 4 ++-- services/accesstokenmanager/test/BUILD.gn | 16 ++++++++-------- .../common}/database/BUILD.gn | 0 .../common}/database/include/field_const.h | 0 .../common}/database/include/generic_values.h | 0 .../common}/database/include/sqlite_helper.h | 0 .../common}/database/include/statement.h | 0 .../common}/database/include/variant_value.h | 0 .../common}/database/src/generic_values.cpp | 0 .../common}/database/src/sqlite_helper.cpp | 0 .../common}/database/src/statement.cpp | 0 .../common}/database/src/variant_value.cpp | 0 services/privacymanager/BUILD.gn | 4 ++-- 13 files changed, 12 insertions(+), 12 deletions(-) rename {frameworks => services/common}/database/BUILD.gn (100%) rename {frameworks => services/common}/database/include/field_const.h (100%) rename {frameworks => services/common}/database/include/generic_values.h (100%) rename {frameworks => services/common}/database/include/sqlite_helper.h (100%) rename {frameworks => services/common}/database/include/statement.h (100%) rename {frameworks => services/common}/database/include/variant_value.h (100%) rename {frameworks => services/common}/database/src/generic_values.cpp (100%) rename {frameworks => services/common}/database/src/sqlite_helper.cpp (100%) rename {frameworks => services/common}/database/src/statement.cpp (100%) rename {frameworks => services/common}/database/src/variant_value.cpp (100%) diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 6963888e2..0fca1e591 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -33,12 +33,12 @@ ohos_shared_library("accesstoken_manager_service") { "main/cpp/include/device", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", - "//base/security/access_token/frameworks/database/include", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/tokensync/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/privacy/include", "//base/security/access_token/interfaces/innerkits/tokensync/src", + "//base/security/access_token/services/common/database/include", "//base/security/access_token/services/tokensyncmanager/include/common", "//third_party/json/include", ] @@ -73,9 +73,9 @@ ohos_shared_library("accesstoken_manager_service") { deps = [ "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "//base/security/access_token/frameworks/database:accesstoken_database_cxx", "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", "//base/security/access_token/services/accesstokenmanager:access_token.rc", + "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//third_party/sqlite:sqlite", "//utils/native/base:utils", ] diff --git a/services/accesstokenmanager/test/BUILD.gn b/services/accesstokenmanager/test/BUILD.gn index e28033b26..7f2603492 100644 --- a/services/accesstokenmanager/test/BUILD.gn +++ b/services/accesstokenmanager/test/BUILD.gn @@ -20,18 +20,18 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { module_out_path = part_name + "/" + part_name include_dirs = [ - "//utils/native/base/include", - "//third_party/googletest/include", - "//base/security/access_token/services/accesstokenmanager/main/cpp/include/service", - "//base/security/access_token/services/accesstokenmanager/main/cpp/include/token", - "//base/security/access_token/services/accesstokenmanager/main/cpp/include/permission", - "//base/security/access_token/services/accesstokenmanager/main/cpp/include/database", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", - "//base/security/access_token/frameworks/database/include", "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", + "//base/security/access_token/services/accesstokenmanager/main/cpp/include/service", + "//base/security/access_token/services/accesstokenmanager/main/cpp/include/token", + "//base/security/access_token/services/accesstokenmanager/main/cpp/include/permission", + "//base/security/access_token/services/accesstokenmanager/main/cpp/include/database", + "//base/security/access_token/services/common/database/include", "//third_party/json/include", + "//third_party/googletest/include", + "//utils/native/base/include", ] sources = [ @@ -48,10 +48,10 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { deps = [ "//base/security/access_token/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "//base/security/access_token/frameworks/database:accesstoken_database_cxx", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/services/accesstokenmanager/:accesstoken_manager_service", + "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/frameworks/database/BUILD.gn b/services/common/database/BUILD.gn similarity index 100% rename from frameworks/database/BUILD.gn rename to services/common/database/BUILD.gn diff --git a/frameworks/database/include/field_const.h b/services/common/database/include/field_const.h similarity index 100% rename from frameworks/database/include/field_const.h rename to services/common/database/include/field_const.h diff --git a/frameworks/database/include/generic_values.h b/services/common/database/include/generic_values.h similarity index 100% rename from frameworks/database/include/generic_values.h rename to services/common/database/include/generic_values.h diff --git a/frameworks/database/include/sqlite_helper.h b/services/common/database/include/sqlite_helper.h similarity index 100% rename from frameworks/database/include/sqlite_helper.h rename to services/common/database/include/sqlite_helper.h diff --git a/frameworks/database/include/statement.h b/services/common/database/include/statement.h similarity index 100% rename from frameworks/database/include/statement.h rename to services/common/database/include/statement.h diff --git a/frameworks/database/include/variant_value.h b/services/common/database/include/variant_value.h similarity index 100% rename from frameworks/database/include/variant_value.h rename to services/common/database/include/variant_value.h diff --git a/frameworks/database/src/generic_values.cpp b/services/common/database/src/generic_values.cpp similarity index 100% rename from frameworks/database/src/generic_values.cpp rename to services/common/database/src/generic_values.cpp diff --git a/frameworks/database/src/sqlite_helper.cpp b/services/common/database/src/sqlite_helper.cpp similarity index 100% rename from frameworks/database/src/sqlite_helper.cpp rename to services/common/database/src/sqlite_helper.cpp diff --git a/frameworks/database/src/statement.cpp b/services/common/database/src/statement.cpp similarity index 100% rename from frameworks/database/src/statement.cpp rename to services/common/database/src/statement.cpp diff --git a/frameworks/database/src/variant_value.cpp b/services/common/database/src/variant_value.cpp similarity index 100% rename from frameworks/database/src/variant_value.cpp rename to services/common/database/src/variant_value.cpp diff --git a/services/privacymanager/BUILD.gn b/services/privacymanager/BUILD.gn index b6182a317..cd04e2fd7 100644 --- a/services/privacymanager/BUILD.gn +++ b/services/privacymanager/BUILD.gn @@ -24,9 +24,9 @@ ohos_shared_library("privacy_manager_service") { "include/service", "//base/security/access_token/frameworks/privacy/include", "//base/security/access_token/frameworks/common/include", - "//base/security/access_token/frameworks/database/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/privacy/include", + "//base/security/access_token/services/common/database/include", "//third_party/json/include", ] @@ -51,9 +51,9 @@ ohos_shared_library("privacy_manager_service") { deps = [ "//base/security/access_token/frameworks/common:accesstoken_common_cxx", - "//base/security/access_token/frameworks/database:accesstoken_database_cxx", "//base/security/access_token/frameworks/privacy:privacy_communication_adapter_cxx", "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "//base/security/access_token/services/common/database:accesstoken_database_cxx", "//third_party/sqlite:sqlite", "//utils/native/base:utils", ] -- Gitee