From fb357f3dcd590df9db78111dc288450b0389b926 Mon Sep 17 00:00:00 2001 From: chuxuezhe111 Date: Tue, 28 Jun 2022 05:12:02 -0700 Subject: [PATCH 1/4] modify the preloader_output_dir to adapter product_name Signed-off-by: chuxuezhe111 --- BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 8e0545d..4adc90c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -150,7 +150,8 @@ build_ext_component("generate_pcid") { cmd = "${exec_path}/clang_x64/developtools/syscap_codec/syscap_tool" } command = "chmod 777 $cmd" - command += " && $cmd -P -e -i ${preload_path}/${product_name}/system/etc/SystemCapability.json" + command += + " && $cmd -P -e -i ${preload_path}/system/etc/SystemCapability.json" if (defined(ohos_lite)) { command += " && mkdir -p $exec_path/system/etc && cp $exec_path/PCID.sc $exec_path/system/etc/PCID.sc" } From 04184b1264af9d54e0515bab238878029f52eebb Mon Sep 17 00:00:00 2001 From: wuchunbo Date: Wed, 29 Jun 2022 11:54:29 +0800 Subject: [PATCH 2/4] add multimedia_av_sessiom component Signed-off-by: wuchunbo --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index f2e4223..14f9a18 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -125,6 +125,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_SPLITER, MULTIMEDIA_MEDIA_VIDEOPLAYER, MULTIMEDIA_MEDIA_VIDEORECORDER, + MULTIMEDIA_AV_SESSION, MULTIMODALINPUT_INPUT, NOTIFICATION_COMMONEVENT, NOTIFICATION_EMITTER, @@ -278,6 +279,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.Multimedia.Media.Spliter", MULTIMEDIA_MEDIA_SPLITER}, {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, + {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, From b00ada88b66fe7e66c69e0d526344c58892e4070 Mon Sep 17 00:00:00 2001 From: "taiyi.pei" Date: Mon, 4 Jul 2022 09:56:06 +0800 Subject: [PATCH 3/4] correct deps Signed-off-by: taiyi.pei --- bundle.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 8cef567..1f66266 100644 --- a/bundle.json +++ b/bundle.json @@ -16,10 +16,13 @@ "feature": [], "adapted_system_type": [ "small", "standard" ], "deps": { - "components": [], + "components": [ + "napi", + "hiviewdfx_hilog_native" + ], "third_party": [ "bounds_checking_function", - "thirdparty_cjson" + "cjson" ] }, "build": { @@ -38,4 +41,4 @@ "test": [ "//developtools/syscap_codec/test/unittest/common:unittest" ] } } -} \ No newline at end of file +} From 0d5192664fffe9494f8e01ba82b7de47e371cf16 Mon Sep 17 00:00:00 2001 From: wuhaobo Date: Mon, 4 Jul 2022 10:43:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E9=9F=B3=E9=A2=91=E7=9A=84syscap=5Fdefine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuhaobo --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index f59f2ad..e42012d 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -63,6 +63,7 @@ typedef enum SystemCapabilityNum { DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE, DISTRIBUTEDHARDWARE_DEVICEMANAGER, DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA, + DISTRIBUTEDHARDWARE_DISTRIBUTED_AUDIO, DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK, DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN, DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT, @@ -217,6 +218,7 @@ const static SyscapWithNum arraySyscap[] = { {"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE}, {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, {"SystemCapability.DistributedHardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTED_CAMERA}, + {"SystemCapability.DistributedHardware.DistributedAudio", DISTRIBUTEDHARDWARE_DISTRIBUTED_AUDIO}, {"SystemCapability.DistributedHardware.DistributedHardwareFWK", DISTRIBUTEDHARDWARE_DISTRIBUTED_HARDWARE_FWK}, {"SystemCapability.DistributedHardware.DistributedScreen", DISTRIBUTEDHARDWARE_DISTRIBUTED_SCREEN}, {"SystemCapability.DistributedHardware.DistributedInput", DISTRIBUTEDHARDWARE_DISTRIBUTED_INPUT},