!5584 switch path deps on utils to commonlibrary in xts_acts

Merge pull request !5584 from Leon/master

ability/ability_runtime/actsfwkdataaccessortest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsserviceabilityclienttest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/amsdatauriutils/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/amsgetabilityprocessinfo/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/context/actscontexttest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/fa/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/fa/faapplicationinfo/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/fa/facoverapi/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/want/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/ability_runtime/want/actsgetwantalltest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability/dmsfwk/continuationmanagertest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

ability_lite/ability_posix/BUILD.gn

@@ -53,7 +53,7 @@ hcpptest_suite("ActsAbilityMgrTest") {
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//third_party/bounds_checking_function/include",
     "//third_party/cJSON",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "${appexecfwk_lite_path}/interfaces/innerkits/bundlemgr_lite",
     "//foundation/graphic/ui/interfaces/kits",
     "//foundation/graphic/utils/interfaces/innerkits",

ai_lite/ai_engine_posix/base/BUILD.gn

@@ -44,7 +44,7 @@ hcpptest_suite("ActsAiEngineTest") {
     "//foundation/ai/engine/services/algorithmsdk",
     "//foundation/ai/engine/services/server/plugin",
     "//third_party/bounds_checking_function/include",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//kernel/liteos-a/kernel/include",
     "//kernel/liteos-a/kernel/common",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/innerkits/registry",

appexecfwk_lite/appexecfwk_posix/BUILD.gn

@@ -29,7 +29,7 @@ hcpptest_suite("ActsBundleMgrTest") {
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
     "//third_party/googletest/googletest/include",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "${aafwk_lite_path}/interfaces/innerkits/intent_lite",
     "//third_party/cJSON",
   ]

applications/kitframework/BUILD.gn

@@ -21,7 +21,7 @@ hctest_suite("ActsKitFwkApiTest") {
   include_dirs = [
     "//test/xts/tools/lite/hctest/include",
     "//third_party/unity/src",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//third_party/bounds_checking_function/include/",
     "//third_party/mbedtls/include/",

barrierfree/accessibilityconfig/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

barrierfree/accessibleabilitylist/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

barrierfree/accessiblecaptionconfiguration/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

barrierfree/accessiblecheckability/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

barrierfree/accessibleregisterstate/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

barrierfree/accessiblesendevent/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsaccesstokentest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsetsunpermissiontest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsgetinfostest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmshapmoduletest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsjstest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsjsunpermissiontest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbmsmetadatatest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagertest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

commonlibrary/ets_utils/containerLine_lib_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("containerLine_js_test") {

commonlibrary/ets_utils/containerRelation_lib_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("containerRelation_js_test") {

commonlibrary/toolchain/libc-test/BUILD.gn

@@ -19,7 +19,7 @@ import("//test/xts/tools/build/suite.gni")
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "//third_party/bounds_checking_function/include",
     "//third_party/musl/porting/linux/user/include",
     "//test/xts/acts/security_lite/huks/common/include",
@@ -39,7 +39,7 @@ ohos_moduletest_suite("ActToolChainTest") {
   ]
 
   include_dirs = [
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "//third_party/bounds_checking_function/include",
     "//third_party/musl/porting/linux/user/include/",
     "//third_party/musl/porting/linux/user/src/sched",
@@ -47,8 +47,6 @@ ohos_moduletest_suite("ActToolChainTest") {
     "./include",
   ]
 
-  deps = [
-    "//third_party/bounds_checking_function:libsec_static",
-    "//utils/native/base:utils",
-  ]
+  external_deps = [ "c_utils:utils" ]
+  deps = [ "//third_party/bounds_checking_function:libsec_static" ]
 }

commonlibrary_lite/file_hal/BUILD.gn

@@ -22,7 +22,7 @@ hctest_suite("ActsUtilsFileTest") {
 
   include_dirs = [
     "src",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
   ]
   cflags = [ "-Wno-error" ]
 }

communication/bluetooth_ble/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("ActsBluetoothBleJsTest") {

communication/bluetooth_on/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("ActsBluetoothOnJsTest") {

communication/bluetooth_profile/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("ActsBluetoothProFileJsTest") {

communication/wifi_p2p/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

communication/wifi_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

distributed_schedule_lite/distributed_schedule_posix/BUILD.gn

@@ -25,7 +25,7 @@ hcpptest_suite("ActsDMSTest") {
   include_dirs = [
     "src",
     "src/utils",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//third_party/bounds_checking_function/include",
     "//foundation/communication/ipc/interfaces/innerkits/c/ipc/include",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",

distributeddatamgr/preferencesjstest/hap/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

distributeddatamgr_lite/kv_store_hal/BUILD.gn

@@ -23,7 +23,7 @@ hctest_suite("ActsKvStoreTest") {
 
   include_dirs = [
     "src",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//base/iothardware/peripheral/interfaces/inner_api",
   ]
   cflags = [ "-Wno-error" ]

distributeddatamgr_lite/kv_store_posix/BUILD.gn

@@ -21,7 +21,7 @@ hcpptest_suite("ActsKvStoreTest") {
     "src",
     "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store/include",
     "//third_party/bounds_checking_function/include",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
   ]
   deps = [ "//foundation/distributeddatamgr/kv_store/interfaces/inner_api/kv_store:kv_store" ]
   cflags = [ "-Wno-error" ]

graphic/graphicnapidrawingtest/BUILD.gn

@@ -45,9 +45,9 @@ ohos_moduletest_suite("ActsGraphicNapiDrawingTest") {
     "//third_party/googletest/googletest/include",
   ]
 
+  external_deps = [ "c_utils:utils" ]
   deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//commonlibrary/c_utils/base:utils",
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//third_party/googletest:gtest_main",
   ]

hiviewdfx/hiappeventtest/hiappeventcpptest/BUILD.gn

@@ -29,12 +29,12 @@ config("hilogtest_config") {
 ohos_moduletest_suite("ActsHiAppEventCPPTest") {
   module_out_path = module_output_path
   sources = [ "HiAppEventCPPTest.cpp" ]
+  external_deps = [ "c_utils:utils" ]
   deps = [
     "../../utils/native:utilskit",
     "//base/hiviewdfx/hiappevent/frameworks/native/libhiappevent:libhiappevent_base",
     "//base/hiviewdfx/hiappevent/frameworks/native/ndk:hiappevent_ndk",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//commonlibrary/c_utils/base:utils",
     "//third_party/googletest:gtest_main",
   ]
   configs = [ ":hilogtest_config" ]

hiviewdfx/hilogtest/hilogndktest/BUILD.gn

@@ -24,10 +24,10 @@ config("hilogndktest_config") {
 ohos_moduletest_suite("ActsHilogndkTest") {
   module_out_path = module_output_path
   sources = [ "hilogndktest.cpp" ]
+  external_deps = [ "c_utils:utils" ]
   deps = [
     "//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk",
     "//base/hiviewdfx/hilog/interfaces/native/kits:libhilog_ndk",
-    "//commonlibrary/c_utils/base:utils",
     "//third_party/googletest:gtest_main",
   ]
   configs = [ ":hilogndktest_config" ]

hiviewdfx/hitracechaintest/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

hiviewdfx/utils/native/BUILD.gn

@@ -30,9 +30,9 @@ ohos_static_library("utilskit") {
   configs = [ ":utils_config" ]
 
   #external_deps = [ "hilog:libhilog" ]
+  external_deps = [ "c_utils:utils" ]
   deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//base/hiviewdfx/hiview/base:hiviewbase",
-    "//commonlibrary/c_utils/base:utils",
   ]
 }

multimedia/image/image_js_standard/imageCreator/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

multimedia/image/image_js_standard/imageRGBA/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

multimedia/media/media_cpp_standard/BUILD.gn

@@ -29,7 +29,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
     "videoDecEncNdk/include",
     "//foundation/multimedia/audio_framework/interfaces/inner_api/native/audiocommon/include",
     "//foundation/multimedia/player_framework/interfaces/kits/c",
-    "//utils/native/base/include",
+    "//commonlibrary/c_utils/base/include",
     "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
   ]
 
@@ -51,6 +51,7 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
     "",
   ]
 
+  external_deps = [ "c_utils:utils" ]
   deps = [
     "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_adec",
@@ -59,7 +60,6 @@ ohos_moduletest_suite("ActsAvcodecNdkTest") {
     "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_core",
     "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_vdec",
     "//foundation/multimedia/player_framework/interfaces/kits/c:native_media_venc",
-    "//utils/native/base:utils",
   ]
 
   subsystem_name = "multimedia"

multimedia/medialibrary/mediaLibrary_favorite/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

multimedia/medialibrary/mediaLibrary_file/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

multimedia/medialibrary/mediaLibrary_fileResult/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

multimodalinput/multimodalinput_ets_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

notification/ces_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//build/ohos_var.gni")
 

security_lite/deviceauth_basic_deps/BUILD.gn

@@ -23,7 +23,7 @@ hctest_suite("ActsSecurityHichainBasicDeps") {
 
   include_dirs = [
     "//commonlibrary/c_utils/base/include",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//test/xts/tools/lite/hctest/include",
     "//third_party/unity/src",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",

security_lite/permission_posix/pms/BUILD.gn

@@ -31,7 +31,7 @@ hcpptest_suite("ActsPMSTest") {
   include_dirs = [
     "src",
     "include",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
     "//foundation/systemabilitymgr/samgr_lite/interfaces/kits/communication/broadcast",
     "//base/security/permission_lite/interfaces/innerkits",

sensors/miscdevice_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

sensors/sensor_standard/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

settingsdata/settings_ets/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

telephony/telephonyjstest/call_manager/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 

telephony/telephonyjstest/sim/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # 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.
+# limitations under the License.
 
 import("//build/ohos_var.gni")
 

update_lite/dupdate_posix/BUILD.gn

@@ -20,7 +20,7 @@ hcpptest_suite("ActsUpdateTest") {
   include_dirs = [
     "//base/update/ota_lite/interfaces/kits",
     "//base/update/ota_lite/hals",
-    "//utils/native/lite/include",
+    "//commonlibrary/utils_lite/include",
   ]
   deps = [
     "$ohos_third_party_dir/mbedtls:mbedtls_static",