From 96d8c47429fa57e6d5ba69af656fafff4b2c1842 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Fri, 28 Jun 2024 15:30:26 +0800 Subject: [PATCH] modify access token deps Signed-off-by: chen0088 --- common/test/unittest/common/utils/BUILD.gn | 4 ++-- .../native_cpp/test/unittest/common/camera_sink/BUILD.gn | 4 ++-- .../cameraoperator/client/test/sample/BUILD.gn | 6 ++---- .../client/test/unittest/common/cameraoperator/BUILD.gn | 4 ++-- .../handler/test/unittest/common/dcamerahandler/BUILD.gn | 4 ++-- .../test/unittest/common/distributedcamera/BUILD.gn | 5 ++--- .../test/unittest/common/distributedcameramgr/BUILD.gn | 5 +++-- .../test/unittest/common/distributedcamera/BUILD.gn | 4 ++-- .../test/unittest/common/distributedcameramgr/BUILD.gn | 4 ++-- test/distributedcameraclienttest/BUILD.gn | 6 ++---- 10 files changed, 21 insertions(+), 25 deletions(-) diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index 523989b7..f53e98fe 100644 --- a/common/test/unittest/common/utils/BUILD.gn +++ b/common/test/unittest/common/utils/BUILD.gn @@ -57,8 +57,8 @@ ohos_unittest("CommonUtilsTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn index 58183597..eed46b0f 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn @@ -48,8 +48,8 @@ ohos_unittest("DCameraSinkHandlerTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "c_utils:utils", "dsoftbus:softbus_client", "hilog:libhilog", diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index f513cb39..9a456289 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -58,10 +58,8 @@ ohos_executable("dcamera_client_demo") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libnativetoken", - "access_token:libtoken_setproc", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils", diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index eee97ca9..7dc97714 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -70,8 +70,8 @@ ohos_unittest("DCameraClientTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", "drivers_interface_camera:libbuffer_handle_sequenceable_1.0", diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index 01671fa2..8d6a7203 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -58,8 +58,8 @@ ohos_unittest("DCameraHandlerTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", "drivers_interface_camera:metadata", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index fcc04f44..6a428d6f 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -79,9 +79,8 @@ ohos_unittest("DistributedCameraSinkServiceTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", - "access_token:libtokenid_sdk", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", "drivers_interface_camera:metadata", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 3ec5406f..d3a2253b 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -95,8 +95,8 @@ ohos_unittest("DCameraSinkMgrTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils", @@ -108,6 +108,7 @@ ohos_unittest("DCameraSinkMgrTest") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index 18d6f5f5..b342819a 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -82,8 +82,8 @@ ohos_unittest("DCameraSourceTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index a9a72215..96fdd28c 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -89,8 +89,8 @@ ohos_unittest("DCameraSourceMgrTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", diff --git a/test/distributedcameraclienttest/BUILD.gn b/test/distributedcameraclienttest/BUILD.gn index 5d4125db..4d04600b 100644 --- a/test/distributedcameraclienttest/BUILD.gn +++ b/test/distributedcameraclienttest/BUILD.gn @@ -54,10 +54,8 @@ ohos_moduletest_suite("SubDctsdisCameraClientTest") { external_deps = [ "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libnativetoken", - "access_token:libtoken_setproc", - "access_token:libtoken_setproc", + "access_token:libnativetoken_shared", + "access_token:libtokensetproc_shared", "av_codec:av_codec_client", "c_utils:utils", "camera_framework:camera_framework", -- Gitee