!134 添加 syscap_define.h 文件检查。

Merge pull request !134 from chenyude/syscap_check
2026-08-27 02:11:19 -04:00 · 2022-08-17 08:03:58 +00:00
parent 080561b405 a124885f9a
commit ceac24d420
6 changed files with 86 additions and 31 deletions
@@ -24,6 +24,31 @@ sources_platform_common = [
  "./src/endian_internal.c",
 ]

+ohos_executable("syscap_define_check_bin") {
+  include_dirs = [ "include" ]
+  sources = [ "./test/syscap_define_check.c" ]
+
+  if (is_mingw) {
+    defines = [ "_POSIX_" ]
+  }
+
+  subsystem_name = "developtools"
+  part_name = "syscap_codec"
+}
+
+build_ext_component("syscap_define_check") {
+  deps = [ ":syscap_define_check_bin(//build/toolchain/linux:clang_x64)" ]
+  exec_path = rebase_path(root_out_dir)
+
+  if (defined(ohos_lite)) {
+    cmd = "${exec_path}/clang_x64/syscap_define_check_bin"
+  } else {
+    cmd = "${exec_path}/clang_x64/developtools/syscap_codec/syscap_define_check_bin"
+  }
+
+  command = "chmod 777 $cmd && $cmd"
+}
+
 ohos_executable("syscap_tool_bin") {
  output_name = "syscap_tool"
  install_enable = true
@@ -172,6 +197,7 @@ group("pcid_sc") {
 group("syscap_codec") {
  deps = [
    ":pcid_sc",
+    ":syscap_define_check",
    ":syscap_interface_shared",
    ":syscap_tool_shared",
  ]
@@ -1,3 +1,4 @@
+v2.0.0 reorganize syscap define.
 v1.1.2 add syscap "SystemCapability.ArkUI.UiAppearance".
 v1.1.1 add compare string pcid with rpcid function.
 v1.1.0 add encode/decode string format PCID/RPCID.
@@ -32,8 +32,6 @@ typedef struct SystemCapabilityWithNum {
 typedef enum SystemCapabilityNum {
    ACCOUNT_APPACCOUNT,
    ACCOUNT_OSACCOUNT,
-    ACE_ACEENGINELITE, // abandoned
-    ACE_UIAPPEARANCE, // abandoned
    AI_AIENGINE,
    APPLICATIONS_CONTACTSDATA,
    BARRIERFREE_ACCESSIBILITY_CORE,
@@ -48,9 +46,7 @@ typedef enum SystemCapabilityNum {
    COMMUNICATION_NETSTACK,
    COMMUNICATION_NFC_CORE,
    COMMUNICATION_SOFTBUS_CORE,
-    COMMUNICATION_WIFI_AP, // abandoned
    COMMUNICATION_WIFI_CORE,
-    COMMUNICATION_WIFI_HOTSPOTEXT, // abandoned
    COMMUNICATION_WIFI_P2P,
    COMMUNICATION_WIFI_STA,
    CUSTOMIZATION_CONFIGPOLICY,
@@ -100,9 +96,7 @@ typedef enum SystemCapabilityNum {
    KERNEL_LINUX,
    KERNEL_LITEOS_A,
    KERNEL_LITEOS_M,
-    LOCATION_LOCATION, // abandoned
    MISCSERVICES_DOWNLOAD,
-    MISCSERVICES_INPUTMETHOD, // abandoned
    MISCSERVICES_PASTEBOARD,
    MISCSERVICES_SCREENLOCK,
    MISCSERVICES_TIME,
@@ -117,7 +111,6 @@ typedef enum SystemCapabilityNum {
    MULTIMEDIA_MEDIALIBRARY,
    MULTIMEDIA_MEDIA_AUDIOPLAYER,
    MULTIMEDIA_MEDIA_AUDIORECORDER,
-    MULTIMEDIA_MEDIA_CODEC, // abandoned
    MULTIMEDIA_MEDIA_AUDIODECODER,
    MULTIMEDIA_MEDIA_AUDIOENCODER,
    MULTIMEDIA_MEDIA_VIDEODECODER,
@@ -179,12 +172,10 @@ typedef enum SystemCapabilityNum {
    UPDATER_RAW,
    UPDATE_UPDATESERVICE,
    USB_USBMANAGER,
-    USERIAM_AUTHEXECUTORMANAGER, // abandonded
    USERIAM_USERAUTH_CORE,
    USERIAM_USERAUTH_FACEAUTH,
    USERIAM_USERAUTH_FINGERPRINTAUTH,
    USERIAM_USERAUTH_PINAUTH,
-    USERIAM_USERIDM, // abandonded
    ARKUI_UIAPPEARANCE,
    SECURITY_CERTIFICATE_MANAGER,
    GRAPHIC_GRAPHIC2D_VULKAN,
@@ -229,32 +220,21 @@ typedef enum SystemCapabilityNum {
 const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.Account.AppAccount", ACCOUNT_APPACCOUNT},
    {"SystemCapability.Account.OsAccount", ACCOUNT_OSACCOUNT},
-    {"SystemCapability.ArkUI.UiAppearance", ARKUI_UIAPPEARANCE},
-    {"SystemCapability.Ace.AceEngineLite", ACE_ACEENGINELITE},
-    {"SystemCapability.ArkUI.ArkUI.Lite", ARKUI_ARKUI_LITE},
-    {"SystemCapability.ArkUI.ArkUI.Full", ARKUI_ARKUI_FULL},
-    {"SystemCapability.ArkUI.ArkUI.Libuv", ARKUI_ARKUI_LIBUV},
-    {"SystemCapability.ArkUI.ArkUI.Napi", ARKUI_ARKUI_NAPI},
    {"SystemCapability.Ai.AiEngine", AI_AIENGINE},
    {"SystemCapability.Applications.ContactsData", APPLICATIONS_CONTACTSDATA},
    {"SystemCapability.Barrierfree.Accessibility.Core", BARRIERFREE_ACCESSIBILITY_CORE},
-    {"SystemCapability.BarrierFree.Accessibility.Hearing", BARRIERFREE_ACCESSIBILITY_HEARING},
-    {"SystemCapability.BarrierFree.Accessibility.Vision", BARRIERFREE_ACCESSIBILITY_VISION},
    {"SystemCapability.BundleManager.BundleFramework", BUNDLEMANAGER_BUNDLEFRAMEWORK},
    {"SystemCapability.BundleManager.BundleTool", BUNDLEMANAGER_BUNDLETOOL},
    {"SystemCapability.BundleManager.DistributedBundleFramework", BUNDLEMANAGER_DISTRIBUTEDBUNDLEFRAMEWORK},
    {"SystemCapability.BundleManager.Zlib", BUNDLEMANAGER_ZLIB},
    {"SystemCapability.Communication.Bluetooth.Core", COMMUNICATION_BLUETOOTH_CORE},
-    {"SystemCapability.Communication.Bluetooth.Lite", COMMUNICATION_BLUETOOTH_LITE},
    {"SystemCapability.Communication.ConnectedTag", COMMUNICATION_CONNECTEDTAG},
    {"SystemCapability.Communication.NetManager.Core", COMMUNICATION_NETMANAGER_CORE},
    {"SystemCapability.Communication.NetManager.Extension", COMMUNICATION_NETMANAGER_EXTENSION},
    {"SystemCapability.Communication.NetStack", COMMUNICATION_NETSTACK},
    {"SystemCapability.Communication.NFC.Core", COMMUNICATION_NFC_CORE},
    {"SystemCapability.Communication.SoftBus.Core", COMMUNICATION_SOFTBUS_CORE},
-    {"SystemCapability.Communication.WiFi.AP.Core", COMMUNICATION_WIFI_AP_CORE},
    {"SystemCapability.Communication.WiFi.Core", COMMUNICATION_WIFI_CORE},
-    {"SystemCapability.Communication.WiFi.AP.Extension", COMMUNICATION_WIFI_AP_EXTENSION},
    {"SystemCapability.Communication.WiFi.P2P", COMMUNICATION_WIFI_P2P},
    {"SystemCapability.Communication.WiFi.STA", COMMUNICATION_WIFI_STA},
    {"SystemCapability.Customization.ConfigPolicy", CUSTOMIZATION_CONFIGPOLICY},
@@ -282,7 +262,6 @@ const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.Graphic.Graphic2D.GLES3", GRAPHIC_GRAPHIC2D_GLES3},
    {"SystemCapability.Graphic.Graphic2D.NativeDrawing", GRAPHIC_GRAPHIC2D_NATIVEDRAWING},
    {"SystemCapability.Graphic.Graphic2D.NativeWindow", GRAPHIC_GRAPHIC2D_NATIVEWINDOW},
-    {"SystemCapability.Graphic.Graphic2D.Vulkan", GRAPHIC_GRAPHIC2D_VULKAN},
    {"SystemCapability.Graphic.Graphic2D.WebGL", GRAPHIC_GRAPHIC2D_WEBGL},
    {"SystemCapability.Graphic.Graphic2D.WebGL2", GRAPHIC_GRAPHIC2D_WEBGL2},
    {"SystemCapability.Graphic.Surface", GRAPHIC_SURFACE},
@@ -305,13 +284,7 @@ const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.Kernel.Linux", KERNEL_LINUX},
    {"SystemCapability.Kernel.liteos-a", KERNEL_LITEOS_A},
    {"SystemCapability.Kernel.liteos-m", KERNEL_LITEOS_M},
-    {"SystemCapability.Location.Location.Core", LOCATION_LOCATION_CORE},
-    {"SystemCapability.Location.Location.Gnss", LOCATION_LOCATION_GNSS},
-    {"SystemCapability.Location.Location.Geofence", LOCATION_LOCATION_GEOFENCE},
-    {"SystemCapability.Location.Location.Geocoder", LOCATION_LOCATION_GEOCODER},
-    {"SystemCapability.Location.Location.Lite", LOCATION_LOCATION_LITE},
    {"SystemCapability.MiscServices.Download", MISCSERVICES_DOWNLOAD},
-    {"SystemCapability.MiscServices.InputMethodFramework", MISCSERVICES_INPUTMETHOD_FRAMEWORK},
    {"SystemCapability.MiscServices.Pasteboard", MISCSERVICES_PASTEBOARD},
    {"SystemCapability.MiscServices.ScreenLock", MISCSERVICES_SCREENLOCK},
    {"SystemCapability.MiscServices.Time", MISCSERVICES_TIME},
@@ -391,9 +364,16 @@ const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.UserIAM.UserAuth.FaceAuth", USERIAM_USERAUTH_FACEAUTH},
    {"SystemCapability.UserIAM.UserAuth.FingerprintAuth", USERIAM_USERAUTH_FINGERPRINTAUTH},
    {"SystemCapability.UserIAM.UserAuth.PinAuth", USERIAM_USERAUTH_PINAUTH},
-    {"SystemCapability.Utils.Lang", UTILS_LANG},
+    {"SystemCapability.ArkUI.UiAppearance", ARKUI_UIAPPEARANCE},
    {"SystemCapability.Security.CertificateManager", SECURITY_CERTIFICATE_MANAGER},
+    {"SystemCapability.Graphic.Graphic2D.Vulkan", GRAPHIC_GRAPHIC2D_VULKAN},
+    {"SystemCapability.Location.Location.Core", LOCATION_LOCATION_CORE},
+    {"SystemCapability.Location.Location.Gnss", LOCATION_LOCATION_GNSS},
+    {"SystemCapability.Location.Location.Geofence", LOCATION_LOCATION_GEOFENCE},
+    {"SystemCapability.Location.Location.Geocoder", LOCATION_LOCATION_GEOCODER},
+    {"SystemCapability.Location.Location.Lite", LOCATION_LOCATION_LITE},
    {"SystemCapability.Developtools.Syscap", DEVELOPTOOLS_SYSCAP},
+    {"SystemCapability.Communication.Bluetooth.Lite", COMMUNICATION_BLUETOOTH_LITE},
    {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE},
    {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER},
    {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER},
@@ -401,6 +381,8 @@ const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME},
    {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION},
    {"SystemCapability.Multimedia.Camera.Core", MULTIMEDIA_CAMERA_CORE},
+    {"SystemCapability.BarrierFree.Accessibility.Hearing", BARRIERFREE_ACCESSIBILITY_HEARING},
+    {"SystemCapability.BarrierFree.Accessibility.Vision", BARRIERFREE_ACCESSIBILITY_VISION},
    {"SystemCapability.Ability.AbilityBase", ABILITY_ABILITYBASE},
    {"SystemCapability.Ability.AbilityRuntime.Core", ABILITY_ABILITYRUNTIME_CORE},
    {"SystemCapability.Ability.AbilityRuntime.FAModel", ABILITY_ABILITYRUNTIME_FAMODEL},
@@ -409,6 +391,14 @@ const static SyscapWithNum g_arraySyscap[] = {
    {"SystemCapability.Ability.AbilityTools.AbilityAssistant", ABILITY_ABILITYTOOLS_ABILITYASSISTANT},
    {"SystemCapability.Ability.DistributedAbilityManager", ABILITY_DISTRIBUTEDABILITYMANAGER},
    {"SystemCapability.Ability.Form", ABILITY_FORM},
+    {"SystemCapability.Communication.WiFi.AP.Core", COMMUNICATION_WIFI_AP_CORE},
+    {"SystemCapability.Communication.WiFi.AP.Extension", COMMUNICATION_WIFI_AP_EXTENSION},
+    {"SystemCapability.ArkUI.ArkUI.Lite", ARKUI_ARKUI_LITE},
+    {"SystemCapability.ArkUI.ArkUI.Full", ARKUI_ARKUI_FULL},
+    {"SystemCapability.ArkUI.ArkUI.Libuv", ARKUI_ARKUI_LIBUV},
+    {"SystemCapability.ArkUI.ArkUI.Napi", ARKUI_ARKUI_NAPI},
+    {"SystemCapability.MiscServices.InputMethodFramework", MISCSERVICES_INPUTMETHOD_FRAMEWORK},
+    {"SystemCapability.Utils.Lang", UTILS_LANG},
 };

 #endif  // _SYSCAP_DEFINE_H
@@ -29,7 +29,7 @@
        printf("ERROR: [%s: %d] -> ", __FILE__, __LINE__); \
        printf(__VA_ARGS__); \
    } while (0)
-#define SYSCAP_VERSION "1.1.2"
+#define SYSCAP_VERSION "2.0.0"
 #define OUTPUT_VERSION_LEN 200
 #define ENCODE 0
 #define DECODE 1
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "syscap_define.h"
+
+int main(void)
+{
+    size_t size = sizeof(g_arraySyscap) / sizeof(SyscapWithNum);
+    size_t flag = 0;
+
+    for (size_t i = 0; i < size; i++) {
+        if (g_arraySyscap[i].num != i) {
+            printf("[Error][syscap_define.h]: %s -> num(%u) should be %lu.\n",
+                g_arraySyscap[i].str, g_arraySyscap[i].num, i);
+            flag++;
+        }
+    }
+    if (flag == 0) {
+        return 0;
+    } else {
+        return -1;
+    }
+}
@@ -137,8 +137,8 @@ HWTEST_F(SyscapCodecTest, ComparePcidString, TestSize.Level1)
    const char rpcidString[] = "33588992,1766370052,65536,276824064,0,0,0,0,0,0,"\
                               "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"\
                               "SystemCapability.vendor.xxxxx1,SystemCapability.device.xxxxx2";
-    const char expect[][256] = {"SystemCapability.Graphic.Graphic2D.Vulkan",
-                                "SystemCapability.Graphic.Utils",
+    const char expect[][256] = {"SystemCapability.HiviewDFX.HiLogLite",
+                                "SystemCapability.HiviewDFX.Hiview.FaultLogger",
                                "SystemCapability.vendor.xxxxx1",
                                "SystemCapability.device.xxxxx2"};
    int32_t ret = ComparePcidString(pcidString, rpcidString, &result);