From 93cb283e8b46b7d3e53244d6ece7ca811fd0da6e Mon Sep 17 00:00:00 2001 From: xing-tai-zhang Date: Thu, 15 Jun 2023 09:33:36 +0800 Subject: [PATCH 1/4] Description: Modify the adaptation based on the component name IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I6V448 Feature or Bugfix: Bugfix Binary Source:NO Signed-off-by: xing-tai-zhang --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index c807cc6..a84b959 100644 --- a/bundle.json +++ b/bundle.json @@ -24,7 +24,7 @@ ], "third_party": [ "bounds_checking_function", - "cjson" + "cJSON" ] }, "build": { From 52089ee24d74d4ceb862859b0c074134d44050b8 Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Wed, 28 Jun 2023 10:02:48 +0000 Subject: [PATCH 2/4] fix syscap adapted to mini Signed-off-by: lixiangpeng5 Change-Id: I53046356a355d1a1ffda9283af1cc8eca4844639 --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 6ac6632..d1fa6d9 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -160,6 +160,7 @@ typedef enum SystemCapabilityNum { SENSORS_MISCDEVICE, SENSORS_SENSOR, SENSORS_SENSOR_LITE, + SENSORS_MISCDEVICE_LITE, TELEPHONY_CALLMANAGER, TELEPHONY_CELLULARCALL, TELEPHONY_CELLULARDATA, @@ -422,6 +423,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Sensors.MiscDevice", SENSORS_MISCDEVICE}, {"SystemCapability.Sensors.Sensor", SENSORS_SENSOR}, {"SystemCapability.Sensors.Sensor.Lite", SENSORS_SENSOR_LITE}, + {"SystemCapability.Sensors.MiscDevice.Lite", SENSORS_MISCDEVICE_LITE}, {"SystemCapability.Telephony.CallManager", TELEPHONY_CALLMANAGER}, {"SystemCapability.Telephony.CellularCall", TELEPHONY_CELLULARCALL}, {"SystemCapability.Telephony.CellularData", TELEPHONY_CELLULARDATA}, From 44ea9142e90bb201a242c70fd2876c8ea0e6054e Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Thu, 29 Jun 2023 03:28:23 +0000 Subject: [PATCH 3/4] fix syscap order Signed-off-by: lixiangpeng5 Change-Id: I671a88d41eaf924dfc2d2047618184d675e0d3b2 --- include/codec_config/syscap_define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index a448512..abd09e8 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -160,7 +160,6 @@ typedef enum SystemCapabilityNum { SENSORS_MISCDEVICE, SENSORS_SENSOR, SENSORS_SENSOR_LITE, - SENSORS_MISCDEVICE_LITE, TELEPHONY_CALLMANAGER, TELEPHONY_CELLULARCALL, TELEPHONY_CELLULARDATA, @@ -290,6 +289,7 @@ typedef enum SystemCapabilityNum { DRIVER_HID_EXTENSION, DRIVER_USB_EXTENSION, HIVIEWDFX_HIVIEW_LOGLIBRARY, + SENSORS_MISCDEVICE_LITE, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -428,7 +428,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Sensors.MiscDevice", SENSORS_MISCDEVICE}, {"SystemCapability.Sensors.Sensor", SENSORS_SENSOR}, {"SystemCapability.Sensors.Sensor.Lite", SENSORS_SENSOR_LITE}, - {"SystemCapability.Sensors.MiscDevice.Lite", SENSORS_MISCDEVICE_LITE}, {"SystemCapability.Telephony.CallManager", TELEPHONY_CALLMANAGER}, {"SystemCapability.Telephony.CellularCall", TELEPHONY_CELLULARCALL}, {"SystemCapability.Telephony.CellularData", TELEPHONY_CELLULARDATA}, @@ -562,6 +561,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Request.FileTransferAgent", REQUEST_FILETRANSFERAGENT}, {"SystemCapability.Driver.HID.Extension", DRIVER_HID_EXTENSION}, {"SystemCapability.Driver.USB.Extension", DRIVER_USB_EXTENSION}, + {"SystemCapability.Sensors.MiscDevice.Lite", SENSORS_MISCDEVICE_LITE}, }; #ifdef __cplusplus From ea775dbc6a3e8386663da295a03a95b702b8f116 Mon Sep 17 00:00:00 2001 From: wangdengze Date: Wed, 28 Jun 2023 18:10:15 +0800 Subject: [PATCH 4/4] add lite Signed-off-by: wangdengze --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 557d7ea..f37bd80 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -289,6 +289,7 @@ typedef enum SystemCapabilityNum { DRIVER_HID_EXTENSION, DRIVER_USB_EXTENSION, HIVIEWDFX_HIVIEW_LOGLIBRARY, + DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE_Lite, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -327,6 +328,7 @@ const static SyscapWithNum g_arraySyscap[] = { DISTRIBUTEDDATAMANAGER_KVSTORE_DISTRIBUTEDKVSTORE}, {"SystemCapability.DistributedDataManager.KVStore.Lite", DISTRIBUTEDDATAMANAGER_KVSTORE_LITE}, {"SystemCapability.DistributedDataManager.Preferences.Core", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE}, + {"SystemCapability.DistributedDataManager.Preferences.Core.Lite", DISTRIBUTEDDATAMANAGER_PREFERENCES_CORE_Lite}, {"SystemCapability.DistributedDataManager.RelationalStore.Core", DISTRIBUTEDDATAMANAGER_RELATIONALSTORE_CORE}, {"SystemCapability.DistributedHardware.DeviceManager", DISTRIBUTEDHARDWARE_DEVICEMANAGER}, {"SystemCapability.DistributedHardware.DistributedCamera", DISTRIBUTEDHARDWARE_DISTRIBUTEDCAMERA},