!38 部件化整改

Merge pull request !38 from liuxiaowei42/master

bundle.json

@@ -38,8 +38,8 @@
                 "c_utils",
                 "distributed_hardware_fwk",
                 "config_policy",
-                "hisysevent_native",
-                "hitrace_native",
+                "hisysevent",
+                "hitrace",
                 "graphic_standard",
                 "window_manager"
             ],

dfx_utils/BUILD.gn

@@ -44,7 +44,7 @@ ohos_shared_library("libdinput_dfx_utils") {
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

dfx_utils/test/dfxtest/BUILD.gn

@@ -65,7 +65,7 @@ ohos_unittest("distributed_input_dfx_test") {
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/sink/sinkmanager/BUILD.gn

@@ -65,7 +65,7 @@ ohos_shared_library("libdinput_sink") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
     "graphic_standard:surface",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/sink/transport/BUILD.gn

@@ -55,7 +55,7 @@ ohos_shared_library("libdinput_sink_trans") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/sink/transport/test/sinktransunittest/BUILD.gn

@@ -90,8 +90,8 @@ ohos_unittest("distributed_input_sinktrans_test") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
     "graphic_standard:surface",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
+    "hisysevent:libhisysevent",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/source/sourcemanager/BUILD.gn

@@ -100,8 +100,8 @@ ohos_shared_library("libdinput_source") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
+    "hisysevent:libhisysevent",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn

@@ -122,8 +122,8 @@ ohos_unittest("distributed_input_sourcemanager_test") {
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
+    "hisysevent:libhisysevent",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/source/transport/BUILD.gn

@@ -53,7 +53,7 @@ ohos_shared_library("libdinput_source_trans") {
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "samgr:samgr_proxy",
   ]
 

services/source/transport/test/sourcetransunittest/BUILD.gn

@@ -85,7 +85,7 @@ ohos_unittest("distributed_input_sourcetrans_test") {
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
   ]
 
   cflags_cc = [ "-DHILOG_ENABLE" ]

services/transportbase/BUILD.gn

@@ -54,7 +54,7 @@ ohos_shared_library("libdinput_trans_base") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

services/transportbase/test/transbaseunittest/BUILD.gn

@@ -82,7 +82,7 @@ ohos_unittest("distributed_input_transbase_test") {
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
   ]
 
   cflags_cc = [ "-DHILOG_ENABLE" ]

sinkhandler/BUILD.gn

@@ -54,7 +54,7 @@ ohos_shared_library("libdinput_sink_handler") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

sinkhandler/test/unittest/BUILD.gn

@@ -77,7 +77,7 @@ ohos_unittest("distributed_input_sink_handler_test") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]

sourcehandler/BUILD.gn

@@ -56,7 +56,7 @@ ohos_shared_library("libdinput_source_handler") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",

sourcehandler/test/unittest/BUILD.gn

@@ -78,7 +78,7 @@ ohos_unittest("distributed_input_source_handler_test") {
   external_deps = [
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]

test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn

@@ -63,7 +63,7 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
   ]

test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn

@@ -63,7 +63,7 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
   ]

test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn

@@ -66,7 +66,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
   ]

test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn

@@ -66,7 +66,7 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
-    "hitrace_native:hitrace_meter",
+    "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
   ]

utils/BUILD.gn

@@ -50,7 +50,7 @@ ohos_shared_library("libdinput_utils") {
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "hilog:libhilog",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]

utils/test/unittest/BUILD.gn

@@ -74,7 +74,7 @@ ohos_unittest("distributed_input_utils_test") {
     "c_utils:utils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "hilog:libhilog",
-    "hisysevent_native:libhisysevent",
+    "hisysevent:libhisysevent",
     "ipc:ipc_core",
     "samgr:samgr_proxy",
   ]