From 84ccb8ae758242573db670acbae2e5e752f53dba Mon Sep 17 00:00:00 2001
From: chen <chenpan0560>
Date: Sun, 25 Jun 2023 15:20:02 +0800
Subject: [PATCH] fix:Componentization hiviewdfx_hilog_native >> hilog

Signed-off-by: chenpan0560 <chenpan55@huawei.com>
---
 bundle.json                                   | 57 ++++++-----
 hdf_interfaces/distributed_audio/bundle.json  | 31 +++---
 hdf_service/distributed_audio/bundle.json     | 95 +++++++++----------
 .../hdi_service/audio/v1_0/BUILD.gn           |  4 +-
 .../hdi_service/audio_ext/v1_0/BUILD.gn       |  4 +-
 .../hdi_service/common/BUILD.gn               |  2 +-
 services/common/BUILD.gn                      |  2 +-
 services/hdfaudioclient/BUILD.gn              |  2 +-
 8 files changed, 94 insertions(+), 103 deletions(-)

diff --git a/bundle.json b/bundle.json
index 7d9f88dc..61be1745 100755
--- a/bundle.json
+++ b/bundle.json
@@ -1,33 +1,33 @@
 {
-    "name":"@ohos/distributed_audio",
-    "description":"distributed audio",
-    "version":"4.0",
-    "author":{},
-    "repository":"https://gitee.com/openharmony/distributed_audio",
-    "license":"Apache License 2.0",
-    "publishAs":"code-segment",
-    "segment":{
-        "destPath":"foundation/distributedhardware/distributed_audio"
+    "name": "@ohos/distributed_audio",
+    "description": "distributed audio",
+    "version": "4.0",
+    "author": {},
+    "repository": "https://gitee.com/openharmony/distributed_audio",
+    "license": "Apache License 2.0",
+    "publishAs": "code-segment",
+    "segment": {
+        "destPath": "foundation/distributedhardware/distributed_audio"
     },
-    "dirs":{},
-    "scripts":{},
-    "component":{
-        "name":"distributed_audio",
-        "subsystem":"distributedhardware",
-        "syscap":[
+    "dirs": {},
+    "scripts": {},
+    "component": {
+        "name": "distributed_audio",
+        "subsystem": "distributedhardware",
+        "syscap": [
             "SystemCapability.DistributedHardware.DistributedAudio"
         ],
-        "features":[],
-        "adapted_system_type":[
+        "features": [],
+        "adapted_system_type": [
             "standard"
         ],
-        "rom":"2000KB",
-        "ram":"6MB",
+        "rom": "2000KB",
+        "ram": "6MB",
         "hisysevent_config": [
             "//foundation/distributedhardware/distributed_audio/hisysevent.yaml"
         ],
-        "deps":{
-            "components":[
+        "deps": {
+            "components": [
                 "appexecfwk_standard",
                 "audio_framework",
                 "c_utils",
@@ -38,19 +38,19 @@
                 "hdf_core",
                 "hisysevent_native",
                 "hitrace_native",
-                "hiviewdfx_hilog_native",
+                "hilog",
                 "ipc",
                 "multimedia_image_framework",
                 "player_framework",
                 "safwk",
                 "samgr"
             ],
-            "third_party":[
+            "third_party": [
                 "json"
             ]
         },
-        "build":{
-            "sub_component":[
+        "build": {
+            "sub_component": [
                 "//foundation/distributedhardware/distributed_audio/sa_profile:daudio_sa_profile",
                 "//foundation/distributedhardware/distributed_audio/sa_profile:daudio.cfg",
 
@@ -74,8 +74,7 @@
                 "//foundation/distributedhardware/distributed_audio/services/audiotransport/decodetransport:distributed_audio_decode_transport",
                 "//foundation/distributedhardware/distributed_audio/services/audiotransport/encodetransport:distributed_audio_encode_transport"
             ],
-            "inner_kits":[
-                {
+            "inner_kits": [{
                     "type": "so",
                     "name": "//foundation/distributedhardware/distributed_audio/interfaces/inner_kits/native_cpp/audio_sink:distributed_audio_sink_sdk",
                     "header": {
@@ -138,10 +137,10 @@
                     }
                 }
             ],
-            "test":[
+            "test": [
                 "//foundation/distributedhardware/distributed_audio/interfaces/inner_kits/native_cpp/test/unittest:unittest",
                 "//foundation/distributedhardware/distributed_audio/interfaces/inner_kits/native_cpp/test/fuzztest:fuzztest"
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/hdf_interfaces/distributed_audio/bundle.json b/hdf_interfaces/distributed_audio/bundle.json
index 37db323b..524bddbe 100644
--- a/hdf_interfaces/distributed_audio/bundle.json
+++ b/hdf_interfaces/distributed_audio/bundle.json
@@ -3,13 +3,13 @@
     "description": "distributed audio device driver interface",
     "version": "4.0",
     "license": "Apache License 2.0",
-    "segment":{
-        "destPath":"foundation/distributedhardware/distributed_audio/hdf_interfaces/"
+    "segment": {
+        "destPath": "foundation/distributedhardware/distributed_audio/hdf_interfaces/"
     },
     "component": {
         "name": "drivers_interface_distributed_audio",
         "subsystem": "distributedhardware",
-        "adapted_system_type":[
+        "adapted_system_type": [
             "standard"
         ],
         "rom": "675KB",
@@ -18,7 +18,7 @@
             "components": [
                 "ipc",
                 "hdf_core",
-                "hiviewdfx_hilog_native",
+                "hilog",
                 "c_utils"
             ],
             "third_party": []
@@ -31,36 +31,31 @@
             "test": [
 
             ],
-            "inner_kits": [
-                {
-                    "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
+            "inner_kits": [{
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
                     "header": {
-                        "header_files": [
-                        ],
+                        "header_files": [],
                         "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
                     }
                 },
                 {
-                    "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_stub_1.0",
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_stub_1.0",
                     "header": {
-                        "header_files": [
-                        ],
+                        "header_files": [],
                         "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
                     }
                 },
                 {
-                    "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
                     "header": {
-                        "header_files": [
-                        ],
+                        "header_files": [],
                         "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
                     }
                 },
                 {
-                    "name":"//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_stub_1.0",
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_stub_1.0",
                     "header": {
-                        "header_files": [
-                        ],
+                        "header_files": [],
                         "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
                     }
                 }
diff --git a/hdf_service/distributed_audio/bundle.json b/hdf_service/distributed_audio/bundle.json
index 28fbeb5a..4107be0c 100644
--- a/hdf_service/distributed_audio/bundle.json
+++ b/hdf_service/distributed_audio/bundle.json
@@ -3,56 +3,53 @@
     "description": "distributed audo device driver",
     "version": "4.0",
     "license": "Apache License 2.0",
-    "segment":{
-      "destPath":"foundation/distributedhardware/distributed_audio/hdf_service/"
+    "segment": {
+        "destPath": "foundation/distributedhardware/distributed_audio/hdf_service/"
     },
     "component": {
-      "name": "drivers_peripheral_distributed_audio",
-      "subsystem": "distributedhardware",
-      "adapted_system_type":[
-        "standard"
-      ],
-      "rom": "1000KB",
-      "ram": "8000KB",
-      "deps": {
-        "components": [
-          "c_utils",
-          "drivers_interface_distributed_audio",
-          "hdf_core",
-          "hiviewdfx_hilog_native",
-          "ipc"
+        "name": "drivers_peripheral_distributed_audio",
+        "subsystem": "distributedhardware",
+        "adapted_system_type": [
+            "standard"
         ],
-        "third_party": [
-          "bounds_checking_function"
-        ]
-      },
-      "build": {
-        "sub_component": [
-          "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio:distributed_audio_entry",
-          "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/common:libdaudio_hdf_utils"
-        ],
-        "test": [
-          "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest:hdi_service_audio_test",
-          "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest:hdi_service_audio_ext_test"
-        ],
-        "inner_kits": [
-          {
-            "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
-            "header": {
-              "header_files": [
-              ],
-              "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
-            }
-          },
-          {
-            "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
-            "header": {
-              "header_files": [
-              ],
-              "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
-            }
-          }
-        ]
-      }
+        "rom": "1000KB",
+        "ram": "8000KB",
+        "deps": {
+            "components": [
+                "c_utils",
+                "drivers_interface_distributed_audio",
+                "hdf_core",
+                "hilog",
+                "ipc"
+            ],
+            "third_party": [
+                "bounds_checking_function"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio:distributed_audio_entry",
+                "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/common:libdaudio_hdf_utils"
+            ],
+            "test": [
+                "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest:hdi_service_audio_test",
+                "//foundation/distributedhardware/distributed_audio/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/test/unittest:hdi_service_audio_ext_test"
+            ],
+            "inner_kits": [{
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio/v1_0:libdaudio_proxy_1.0",
+                    "header": {
+                        "header_files": [],
+                        "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audio"
+                    }
+                },
+                {
+                    "name": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext/v1_0:libdaudioext_proxy_1.0",
+                    "header": {
+                        "header_files": [],
+                        "header_base": "//foundation/distributedhardware/distributed_audio/hdf_interfaces/distributed_audio/audioext"
+                    }
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn
index 5e89299e..a387c5fb 100644
--- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn
+++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/BUILD.gn
@@ -50,7 +50,7 @@ ohos_shared_library("libaudio_manager_daudio_primary_service_1.0") {
     "drivers_interface_distributed_audio:libdaudioext_stub_1.0",
     "hdf_core:libhdf_host",
     "hdf_core:libhdf_utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 
@@ -83,7 +83,7 @@ ohos_shared_library("libdaudio_primary_driver") {
     "hdf_core:libhdf_ipc_adapter",
     "hdf_core:libhdf_utils",
     "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 
diff --git a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn
index 9cd6649d..7661955f 100644
--- a/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn
+++ b/hdf_service/distributed_audio/hdi_service/audio_ext/v1_0/BUILD.gn
@@ -37,7 +37,7 @@ ohos_shared_library("libdaudio_manager_daudio_ext_service_1.0") {
     "drivers_interface_distributed_audio:libdaudioext_stub_1.0",
     "hdf_core:libhdf_host",
     "hdf_core:libhdf_utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 
@@ -66,7 +66,7 @@ ohos_shared_library("libdaudio_ext_driver") {
     "hdf_core:libhdf_ipc_adapter",
     "hdf_core:libhdf_utils",
     "hdf_core:libhdi",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 
diff --git a/hdf_service/distributed_audio/hdi_service/common/BUILD.gn b/hdf_service/distributed_audio/hdi_service/common/BUILD.gn
index 393cd53d..5e5c6f15 100644
--- a/hdf_service/distributed_audio/hdi_service/common/BUILD.gn
+++ b/hdf_service/distributed_audio/hdi_service/common/BUILD.gn
@@ -29,7 +29,7 @@ ohos_shared_library("libdaudio_hdf_utils") {
   external_deps = [
     "c_utils:utils",
     "hdf_core:libhdf_utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
   ]
 
   defines = [
diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn
index 942d2054..44f5b89c 100644
--- a/services/common/BUILD.gn
+++ b/services/common/BUILD.gn
@@ -54,9 +54,9 @@ ohos_shared_library("distributed_audio_utils") {
   external_deps = [
     "c_utils:utils",
     "dsoftbus:softbus_client",
+    "hilog:libhilog",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
   ]
 
   defines = [
diff --git a/services/hdfaudioclient/BUILD.gn b/services/hdfaudioclient/BUILD.gn
index 8cab8fb8..9025cbd7 100644
--- a/services/hdfaudioclient/BUILD.gn
+++ b/services/hdfaudioclient/BUILD.gn
@@ -40,7 +40,7 @@ ohos_shared_library("daudio_client") {
     "c_utils:utils",
     "drivers_interface_audio:libaudio_proxy_1.0",
     "hdf_core:libhdf_utils",
-    "hiviewdfx_hilog_native:libhilog",
+    "hilog:libhilog",
     "ipc:ipc_single",
   ]
 
-- 
Gitee