!70 mofiy component name

Merge pull request !70 from 鲍亚永/modify_comp
This commit is contained in:
openharmony_ci
2022-07-22 06:18:50 +00:00
committed by Gitee
13 changed files with 54 additions and 56 deletions
+2 -2
View File
@@ -15,14 +15,14 @@ import("//build/ohos.gni")
################################################################################
group("pasteboard_native_packages") {
group("pasteboard_packages") {
if (is_standard_system) {
deps = [
"etc/init:pasteboardservice.cfg",
"framework/innerkits:pasteboard_client",
"interfaces/declaration:pasteboard_js",
"interfaces/kits:pasteboard_napi",
"profile:miscservices_pasteboard_sa_profiles",
"profile:distributeddatamgr_pasteboard_sa_profiles",
"services:pasteboard_service",
]
}
+9 -9
View File
@@ -5,13 +5,13 @@
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "base/miscservices/pasteboard"
"destPath": "foundation/distributeddatamgr/pasteboard"
},
"dirs": {},
"scripts": {},
"component": {
"name": "pasteboard_native",
"subsystem": "miscservices",
"name": "pasteboard",
"subsystem": "distributeddatamgr",
"syscap": [
"SystemCapability.MiscServices.Pasteboard"
],
@@ -44,28 +44,28 @@
},
"build": {
"sub_component": [
"//base/miscservices/pasteboard:pasteboard_native_packages"
"//foundation/distributeddatamgr/pasteboard:pasteboard_packages"
],
"inner_kits": [
{
"name": "//base/miscservices/pasteboard/framework/innerkits:pasteboard_client",
"name": "//foundation/distributeddatamgr/pasteboard/framework/innerkits:pasteboard_client",
"header": {
"header_files": [
"pasteboard_client.h",
"paste_data.h",
"paste_data_record.h"
],
"header_base":"//base/miscservices/pasteboard/framework/innerkits/include"
"header_base":"//foundation/distributeddatamgr/pasteboard/framework/innerkits/include"
}
}
],
"test": [
"//base/miscservices/pasteboard/services/test:PasteboardServiceTest",
"//base/miscservices/pasteboard/test/fuzztest:fuzztest"
"//foundation/distributeddatamgr/pasteboard/services/test:PasteboardServiceTest",
"//foundation/distributeddatamgr/pasteboard/test/fuzztest:fuzztest"
]
},
"hisysevent_config": [
"//base/miscservices/pasteboard/pasteboardEvent.yaml"
"//foundation/distributeddatamgr/pasteboard/pasteboardEvent.yaml"
]
}
}
+2 -2
View File
@@ -18,6 +18,6 @@ import("//build/ohos.gni")
ohos_prebuilt_etc("pasteboardservice.cfg") {
source = "pasteboardservice.cfg"
relative_install_dir = "init"
part_name = "pasteboard_native"
subsystem_name = "miscservices"
part_name = "pasteboard"
subsystem_name = "distributeddatamgr"
}
+3 -3
View File
@@ -10,8 +10,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//build/ohos.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
config("pasteboard_client_config") {
visibility = [ ":*" ]
@@ -51,6 +51,6 @@ ohos_shared_library("pasteboard_client") {
"samgr_standard:samgr_proxy",
]
subsystem_name = "miscservices"
part_name = "pasteboard_native"
subsystem_name = "distributeddatamgr"
part_name = "pasteboard"
}
+1 -1
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
js_declaration("pasteboard_js") {
part_name = "pasteboard_native"
part_name = "pasteboard"
sources = [ "./api" ]
}
+5 -5
View File
@@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//build/ohos.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
ohos_shared_library("pasteboard_napi") {
include_dirs = [
@@ -35,9 +35,9 @@ ohos_shared_library("pasteboard_napi") {
]
deps = [
"//base/miscservices/pasteboard/framework/innerkits:pasteboard_client",
"//base/miscservices/pasteboard/services:pasteboard_service",
"//foundation/arkui/napi/:ace_napi",
"//foundation/distributeddatamgr/pasteboard/framework/innerkits:pasteboard_client",
"//foundation/distributeddatamgr/pasteboard/services:pasteboard_service",
"//third_party/libuv:uv_static",
"//utils/native/base:utils",
]
@@ -52,6 +52,6 @@ ohos_shared_library("pasteboard_napi") {
relative_install_dir = "module"
subsystem_name = "miscservices"
part_name = "pasteboard_native"
subsystem_name = "distributeddatamgr"
part_name = "pasteboard"
}
+1 -1
View File
@@ -14,7 +14,7 @@
ability_runtime_napi_path =
"//foundation/ability/ability_runtime/frameworks/js/napi"
pasteboard_root_path = "//base/miscservices/pasteboard"
pasteboard_root_path = "//foundation/distributeddatamgr/pasteboard"
pasteboard_kits_path = "${pasteboard_root_path}/kits"
+2 -2
View File
@@ -13,7 +13,7 @@
import("//build/ohos/sa_profile/sa_profile.gni")
ohos_sa_profile("miscservices_pasteboard_sa_profiles") {
ohos_sa_profile("distributeddatamgr_pasteboard_sa_profiles") {
sources = [ "3701.xml" ]
part_name = "pasteboard_native"
part_name = "pasteboard"
}
+17 -17
View File
@@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//build/ohos.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
config("pasteboard_service_config") {
visibility = [ ":*" ]
@@ -25,12 +25,12 @@ config("pasteboard_service_config") {
"${pasteboard_utils_path}/mock/include",
"${pasteboard_utils_path}/native/include",
"//base/miscservices/pasteboard/services/dfx/src",
"//base/miscservices/pasteboard/utils/native/include",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src",
"//foundation/distributeddatamgr/pasteboard/utils/native/include",
"//utils/native/base/include",
"//base/miscservices/pasteboard/services/dfx/src/behaviour",
"//base/miscservices/pasteboard/services/dfx/src/statistic",
"//base/miscservices/pasteboard/services/dfx/src/fault",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/behaviour",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/statistic",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/fault",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
]
@@ -42,15 +42,15 @@ ohos_shared_library("pasteboard_service") {
sources = [
"${pasteboard_utils_path}/mock/src/mock_permission.cpp",
"${pasteboard_utils_path}/native/src/pasteboard_permission.cpp",
"//base/miscservices/pasteboard/services/dfx/src/behaviour/pasteboard_behaviour_reporter_impl.cpp",
"//base/miscservices/pasteboard/services/dfx/src/calculate_time_consuming.cpp",
"//base/miscservices/pasteboard/services/dfx/src/command.cpp",
"//base/miscservices/pasteboard/services/dfx/src/fault/initialization_fault_impl.cpp",
"//base/miscservices/pasteboard/services/dfx/src/hiview_adapter.cpp",
"//base/miscservices/pasteboard/services/dfx/src/pasteboard_dump_helper.cpp",
"//base/miscservices/pasteboard/services/dfx/src/pasteboard_trace.cpp",
"//base/miscservices/pasteboard/services/dfx/src/reporter.cpp",
"//base/miscservices/pasteboard/services/dfx/src/statistic/time_consuming_statistic_impl.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/behaviour/pasteboard_behaviour_reporter_impl.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/calculate_time_consuming.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/command.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/fault/initialization_fault_impl.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/hiview_adapter.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/pasteboard_dump_helper.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/pasteboard_trace.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/reporter.cpp",
"//foundation/distributeddatamgr/pasteboard/services/dfx/src/statistic/time_consuming_statistic_impl.cpp",
"core/src/pasteboard_service.cpp",
"zidl/src/pasteboard_observer_proxy.cpp",
"zidl/src/pasteboard_observer_stub.cpp",
@@ -81,6 +81,6 @@ ohos_shared_library("pasteboard_service") {
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
]
subsystem_name = "miscservices"
part_name = "pasteboard_native"
subsystem_name = "distributeddatamgr"
part_name = "pasteboard"
}
+2 -2
View File
@@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//build/test.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
config("module_private_config") {
visibility = [ ":*" ]
@@ -24,7 +24,7 @@ config("module_private_config") {
]
}
module_output_path = "pasteboard_native/pasteboard_service"
module_output_path = "pasteboard/pasteboard_service"
ohos_unittest("PasteboardServiceTest") {
module_out_path = module_output_path
+1 -1
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
group("fuzztest") {
testonly = true
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
#####################hydra-fuzz###################
import("//build/config/features.gni")
@@ -20,17 +20,15 @@ import("//build/test.gni")
##############################fuzztest##########################################
ohos_fuzztest("PasteboardServiceFuzzTest") {
module_out_path = "miscservices/pasteboard"
module_out_path = "distributeddatamgr/pasteboard"
fuzz_config_file =
"//base/miscservices/pasteboard/test/fuzztest/pasteboardservice_fuzzer"
fuzz_config_file = "//foundation/distributeddatamgr/pasteboard/test/fuzztest/pasteboardservice_fuzzer"
configs =
[ "//base/miscservices/pasteboard/services:pasteboard_service_config" ]
configs = [ "//foundation/distributeddatamgr/pasteboard/services:pasteboard_service_config" ]
include_dirs = [
"//base/miscservices/pasteboard/services/zidl/include",
"//base/miscservices/pasteboard/services/core/include",
"//foundation/distributeddatamgr/pasteboard/services/zidl/include",
"//foundation/distributeddatamgr/pasteboard/services/core/include",
]
cflags = [
@@ -44,8 +42,8 @@ ohos_fuzztest("PasteboardServiceFuzzTest") {
deps = [
"${pasteboard_innerkits_path}:pasteboard_client",
"//base/miscservices/pasteboard/services:pasteboard_service",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core:appexecfwk_core",
"//foundation/distributeddatamgr/pasteboard/services:pasteboard_service",
"//utils/native/base:utils",
]
+2 -2
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/miscservices/pasteboard/pasteboard.gni")
import("//foundation/distributeddatamgr/pasteboard/pasteboard.gni")
config("pasteboard_utils_config") {
include_dirs = [
@@ -42,5 +42,5 @@ ohos_source_set("pasteboard_tools") {
]
external_deps = [ "init:libbegetutil" ]
part_name = "pasteboard_native"
part_name = "pasteboard"
}