!18 修复编译 hispark_taurus_Linux 错误。

Merge pull request !18 from chenyude/syscap
This commit is contained in:
openharmony_ci
2022-04-26 08:00:37 +00:00
committed by Gitee
3 changed files with 8 additions and 0 deletions
+1
View File
@@ -76,6 +76,7 @@ typedef enum SystemCapabilityNum {
HIVIEWDFX_HIVIEW_FAULTLOGGER,
I18N,
GLOBAL_I18N,
KERNEL_LINUX,
KERNEL_LITEOS_A,
LOCATION_LOCATION,
MISCSERVICES_DOWNLOAD,
+1
View File
@@ -96,6 +96,7 @@ static const SyscapWithNum arraySyscap[] = {
{"SystemCapability.HiviewDFX.Hiview.FaultLogger", HIVIEWDFX_HIVIEW_FAULTLOGGER},
{"SystemCapability.I18N", I18N},
{"SystemCapability.Global.I18n", GLOBAL_I18N},
{"SystemCapability.Kernel.Linux", KERNEL_LINUX},
{"SystemCapability.Kernel.liteos-a", KERNEL_LITEOS_A},
{"SystemCapability.Location.Location", LOCATION_LOCATION},
{"SystemCapability.MiscServices.download", MISCSERVICES_DOWNLOAD},
+6
View File
@@ -100,6 +100,7 @@ static SyscapWithNum arraySyscap[] = {
{"SystemCapability.HiviewDFX.Hiview.FaultLogger", HIVIEWDFX_HIVIEW_FAULTLOGGER},
{"SystemCapability.I18N", I18N},
{"SystemCapability.Global.I18n", GLOBAL_I18N},
{"SystemCapability.Kernel.Linux", KERNEL_LINUX},
{"SystemCapability.Kernel.liteos-a", KERNEL_LITEOS_A},
{"SystemCapability.Location.Location", LOCATION_LOCATION},
{"SystemCapability.MiscServices.download", MISCSERVICES_DOWNLOAD},
@@ -357,6 +358,11 @@ int32_t CreatePCID(char *inputFile, char *outDirPath)
for (i = 0; i < osCapSize; i++) {
jsonArrayItem = cJSON_GetArrayItem(jsonOsSyscapObj, i);
osCapIndex = cJSON_GetObjectItem(allOsSyscapObj, jsonArrayItem->valuestring);
if (osCapIndex == NULL) {
PRINT_ERR("can't find the syscap: %s, please checkout.\n", jsonArrayItem->valuestring);
ret = -1;
goto FREE_CONVERT_OUT;
}
sectorOfBits = (osCapIndex->valueint) / BITS_OF_ONE_BYTE;
posOfBits = (osCapIndex->valueint) % BITS_OF_ONE_BYTE;
if (sectorOfBits >= BYTES_OF_OS_SYSCAP) {