mirror of
https://gitee.com/openharmony/deviceprofile_device_info_manager
synced 2024-11-27 01:31:01 +00:00
refactor dir
Signed-off-by: tangfan <tangfan5@huawei.com>
This commit is contained in:
tangfan
parent
8b5f8ccf30
commit
e538989b23
15
bundle.json
15
bundle.json
@ -46,19 +46,18 @@
|
||||
"group_type": {
|
||||
"base_group": [],
|
||||
"fwk_group": [
|
||||
"//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core:distributed_device_profile_client"
|
||||
],
|
||||
"//foundation/deviceprofile/device_info_manager/old/interfaces/innerkits/core:distributed_device_profile_client", ],
|
||||
"service_group": [
|
||||
"//foundation/deviceprofile/device_info_manager/etc/profile:deviceprofile_trust",
|
||||
"//foundation/deviceprofile/device_info_manager/etc/init:etc",
|
||||
"//foundation/deviceprofile/device_info_manager/permission:authority_json",
|
||||
"//foundation/deviceprofile/device_info_manager/old/permission:authority_json",
|
||||
"//foundation/deviceprofile/device_info_manager/sa_profile:dps_sa_profile",
|
||||
"//foundation/deviceprofile/device_info_manager/services/core:distributed_device_profile"
|
||||
"//foundation/deviceprofile/device_info_manager/old/services/core:distributed_device_profile",
|
||||
]
|
||||
},
|
||||
"inner_kits": [
|
||||
{
|
||||
"name": "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core:distributed_device_profile_client",
|
||||
"name": "//foundation/deviceprofile/device_info_manager/old/interfaces/innerkits/core:distributed_device_profile_client",
|
||||
"header": {
|
||||
"header_files": [
|
||||
"distributed_device_profile_client.h",
|
||||
@ -70,13 +69,13 @@
|
||||
"service_characteristic_profile.h",
|
||||
"subscribe_info.h"
|
||||
],
|
||||
"header_base": "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core/include/"
|
||||
"header_base": "//foundation/deviceprofile/device_info_manager/old/interfaces/innerkits/core/include/"
|
||||
}
|
||||
}
|
||||
],
|
||||
"test": [
|
||||
"//foundation/deviceprofile/device_info_manager/services/core:unittest",
|
||||
"//foundation/deviceprofile/device_info_manager/services/core/test/fuzztest:fuzztest"
|
||||
"//foundation/deviceprofile/device_info_manager/old/services/core:unittest",
|
||||
"//foundation/deviceprofile/device_info_manager/old/services/core/test/fuzztest:fuzztest"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,7 +11,17 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
device_profile_path = "//foundation/deviceprofile/device_info_manager"
|
||||
old_device_profile_path = "//foundation/deviceprofile/device_info_manager/old"
|
||||
old_device_profile_service =
|
||||
"//foundation/deviceprofile/device_info_manager/old/services"
|
||||
old_device_profile_innerkits =
|
||||
"//foundation/deviceprofile/device_info_manager/old/interfaces/innerkits"
|
||||
old_device_profile_test = "//foundation/deviceprofile/device_info_manager/old/test"
|
||||
|
||||
old_fuzz_test_output_path = "device_info_manager/device_info_manager"
|
||||
|
||||
device_profile_path = "//foundation/deviceprofile/device_info_manager/"
|
||||
device_profile_common = "//foundation/deviceprofile/device_info_manager/common"
|
||||
device_profile_service =
|
||||
"//foundation/deviceprofile/device_info_manager/services"
|
||||
device_profile_innerkits =
|
||||
|
||||
@ -19,7 +19,7 @@ config("distributed_device_profile_client_config") {
|
||||
visibility = [ ":*" ]
|
||||
include_dirs = [
|
||||
"include",
|
||||
"${device_profile_path}/common/include",
|
||||
"${old_device_profile_path}/common/include",
|
||||
"//third_party/json/include",
|
||||
]
|
||||
}
|
||||
@ -39,11 +39,11 @@ ohos_shared_library("distributed_device_profile_client") {
|
||||
install_enable = true
|
||||
|
||||
sources = [
|
||||
"${device_profile_path}/common/src/device_profile_utils.cpp",
|
||||
"${device_profile_service}/core/src/profile_change_notification.cpp",
|
||||
"${device_profile_service}/core/src/service_characteristic_profile.cpp",
|
||||
"${device_profile_service}/core/src/subscribemanager/subscribe_info.cpp",
|
||||
"${device_profile_service}/core/src/sync_options.cpp",
|
||||
"${old_device_profile_path}/common/src/device_profile_utils.cpp",
|
||||
"${old_device_profile_service}/core/src/profile_change_notification.cpp",
|
||||
"${old_device_profile_service}/core/src/service_characteristic_profile.cpp",
|
||||
"${old_device_profile_service}/core/src/subscribemanager/subscribe_info.cpp",
|
||||
"${old_device_profile_service}/core/src/sync_options.cpp",
|
||||
"src/callback/device_profile_load_callback.cpp",
|
||||
"src/distributed_device_profile_client.cpp",
|
||||
"src/distributed_device_profile_proxy.cpp",
|
||||
@ -52,7 +52,7 @@ ohos_shared_library("distributed_device_profile_client") {
|
||||
|
||||
public_configs = [
|
||||
":distributed_device_profile_client_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
external_deps = [
|
||||
@ -16,7 +16,7 @@ import("//build/ohos_var.gni")
|
||||
import("//foundation/deviceprofile/device_info_manager/deviceprofile.gni")
|
||||
|
||||
device_profile_common_sources =
|
||||
[ "${device_profile_path}/common/src/device_profile_utils.cpp" ]
|
||||
[ "${old_device_profile_path}/common/src/device_profile_utils.cpp" ]
|
||||
|
||||
config("device_info_manager_config") {
|
||||
visibility = [ ":*" ]
|
||||
@ -29,9 +29,9 @@ config("device_info_manager_config") {
|
||||
"include/dbstorage",
|
||||
"include/dfx",
|
||||
"include/subscribemanager",
|
||||
"${device_profile_path}/common/include",
|
||||
"${device_profile_innerkits}/core/include",
|
||||
"${device_profile_service}/core/include",
|
||||
"${old_device_profile_path}/common/include",
|
||||
"${old_device_profile_innerkits}/core/include",
|
||||
"${old_device_profile_service}/core/include",
|
||||
"//third_party/json/include",
|
||||
]
|
||||
}
|
||||
@ -86,7 +86,7 @@ ohos_shared_library("distributed_device_profile") {
|
||||
|
||||
configs = [
|
||||
":device_info_manager_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
external_deps = [
|
||||
@ -19,13 +19,13 @@ import("//foundation/deviceprofile/device_info_manager/deviceprofile.gni")
|
||||
module_output_path = "device_info_manager/deviceprofiletest"
|
||||
|
||||
device_profile_configs = [
|
||||
"${device_profile_service}/core:device_info_manager_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_service}/core:device_info_manager_config",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
device_profile_deps = [
|
||||
"${device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${device_profile_service}/core:distributed_device_profile",
|
||||
"${old_device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${old_device_profile_service}/core:distributed_device_profile",
|
||||
"//third_party/googletest:gtest_main",
|
||||
]
|
||||
|
||||
@ -16,16 +16,16 @@ import("//build/config/features.gni")
|
||||
import("//build/ohos.gni")
|
||||
import("//build/test.gni")
|
||||
import("//foundation/deviceprofile/device_info_manager/deviceprofile.gni")
|
||||
module_output_path = fuzz_test_output_path
|
||||
module_output_path = old_fuzz_test_output_path
|
||||
|
||||
device_profile_configs = [
|
||||
"${device_profile_service}/core:device_info_manager_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_service}/core:device_info_manager_config",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
device_profile_deps = [
|
||||
"${device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${device_profile_service}/core:distributed_device_profile",
|
||||
"${old_device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${old_device_profile_service}/core:distributed_device_profile",
|
||||
]
|
||||
|
||||
##############################fuzztest##########################################
|
||||
@ -33,7 +33,7 @@ ohos_fuzztest("DeviceProfileFuzzTest") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
fuzz_config_file =
|
||||
"${device_profile_service}/core/test/fuzztest/deviceprofile_fuzzer"
|
||||
"${old_device_profile_service}/core/test/fuzztest/deviceprofile_fuzzer"
|
||||
|
||||
cflags = [
|
||||
"-g",
|
||||
@ -16,11 +16,11 @@ import("//build/config/features.gni")
|
||||
import("//build/ohos.gni")
|
||||
import("//build/test.gni")
|
||||
import("//foundation/deviceprofile/device_info_manager/deviceprofile.gni")
|
||||
module_output_path = fuzz_test_output_path
|
||||
module_output_path = old_fuzz_test_output_path
|
||||
|
||||
device_profile_configs = [
|
||||
"${device_profile_service}/core:device_info_manager_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_service}/core:device_info_manager_config",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
device_profile_external_deps = [
|
||||
@ -38,8 +38,8 @@ device_profile_external_deps = [
|
||||
]
|
||||
|
||||
device_profile_deps = [
|
||||
"${device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${device_profile_service}/core:distributed_device_profile",
|
||||
"${old_device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${old_device_profile_service}/core:distributed_device_profile",
|
||||
]
|
||||
|
||||
##############################fuzztest##########################################
|
||||
@ -47,7 +47,7 @@ ohos_fuzztest("DumpLocalProfileFuzzTest") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
fuzz_config_file =
|
||||
"${device_profile_service}/core/test/fuzztest/dumplocalprofile_fuzzer"
|
||||
"${old_device_profile_service}/core/test/fuzztest/dumplocalprofile_fuzzer"
|
||||
|
||||
cflags = [
|
||||
"-g",
|
||||
@ -16,11 +16,11 @@ import("//build/config/features.gni")
|
||||
import("//build/ohos.gni")
|
||||
import("//build/test.gni")
|
||||
import("//foundation/deviceprofile/device_info_manager/deviceprofile.gni")
|
||||
module_output_path = fuzz_test_output_path
|
||||
module_output_path = old_fuzz_test_output_path
|
||||
|
||||
device_profile_configs = [
|
||||
"${device_profile_service}/core:device_info_manager_config",
|
||||
"${device_profile_test}/resource:coverage_flags",
|
||||
"${old_device_profile_service}/core:device_info_manager_config",
|
||||
"${old_device_profile_test}/resource:coverage_flags",
|
||||
]
|
||||
|
||||
device_profile_external_deps = [
|
||||
@ -38,8 +38,8 @@ device_profile_external_deps = [
|
||||
]
|
||||
|
||||
device_profile_deps = [
|
||||
"${device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${device_profile_service}/core:distributed_device_profile",
|
||||
"${old_device_profile_innerkits}/core:distributed_device_profile_client",
|
||||
"${old_device_profile_service}/core:distributed_device_profile",
|
||||
]
|
||||
|
||||
##############################fuzztest##########################################
|
||||
@ -47,7 +47,7 @@ ohos_fuzztest("GetDeviceProfileFuzzTest") {
|
||||
module_out_path = module_output_path
|
||||
|
||||
fuzz_config_file =
|
||||
"${device_profile_service}/core/test/fuzztest/getdeviceprofile_fuzzer"
|
||||
"${old_device_profile_service}/core/test/fuzztest/getdeviceprofile_fuzzer"
|
||||
|
||||
cflags = [
|
||||
"-g",
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user