【部件标准化】deviceauth整改

Signed-off-by: winnieHu <huyu35@huawei.com>

BUILD.gn

@@ -25,20 +25,19 @@ if (defined(ohos_lite)) {
 } else {
   import("//build/ohos.gni")
   import("deviceauth_env.gni")
-  group("deviceauth_build") {
+
+  group("deviceauth_sdk") {
     deps = [ "services:deviceauth" ]
-  }
-
-  group("deviceauth_service_build") {
-    deps = [ "services:deviceauth_service" ]
-  }
-
-  group("deviceauth_sdk_build") {
-    deps = [ "services:deviceauth_sdk" ]
+    if (os_level == "standard" || os_level == "small") {
+      deps += [ "services:deviceauth_service" ]
+      deps += [ "services:deviceauth_sdk" ]
+    }
   }
 
   group("deviceauth_test_build") {
-    testonly = true
-    deps = [ "test/unittest/deviceauth:deviceauth_llt" ]
+    if (os_level == "standard") {
+      testonly = true
+      deps = [ "test/unittest/deviceauth:deviceauth_llt" ]
+    }
   }
 }

bundle.json

@@ -0,0 +1,61 @@
+{
+    "name": "@ohos/deviceauth",
+    "version": "3.1",
+    "description": "The device authentication module belongs to the security subsystem of OpenHarmony. It manages the entire lifecycle of trust relationships between devices.",
+    "publishAs": "code-segment",
+    "segment": {
+        "destPath": "base/security/deviceauth"
+    },
+    "dirs": {},
+    "scripts": {},
+    "author": {},
+    "repository": "",
+    "license": "Apache License 2.0",
+    "component": {
+      "name": "deviceauth_standard",
+      "subsystem": "security",
+      "syscap": [ "SystemCapbility.security.deviceauth" ],
+      "features": [],
+      "adapted_system_type": [
+          "standard",
+          "small",
+          "mini"
+        ],
+      "rom": "500KB",
+      "ram": "500KB",
+      "deps": {
+        "components": [
+          "libhilog",
+          "ipc_core",
+          "system_ability_fwk",
+          "samgr_proxy",
+          "utils_base",
+          "softbus_client"
+        ],
+        "third_party": [ 
+          "cJSON",
+          "bounds_checking_function"
+        ]
+      },
+      "build": {
+        "sub_component": [
+          "//base/security/deviceauth:deviceauth_sdk"
+        ],
+        "inner_kits": [
+          {
+            "name": "//base/security/deviceauth:deviceauth_sdk",
+            "header": {
+              "header_files": [
+                "device_auth_defines.h",
+                "device_auth.h"
+              ],
+              "header_base": "//base/security/deviceauth/interfaces/innerkits"
+            }
+          }
+        ],
+        "test": [ 
+            "//base/security/deviceauth:deviceauth_test_build"
+        ]
+      }
+    }
+}

ohos.build

@@ -1,32 +0,0 @@
-{
-  "subsystem": "security",
-  "parts": {
-    "deviceauth_standard": {
-      "variants": [
-         "phone",
-         "wearable"
-      ],
-      "module_list": [
-         "//base/security/deviceauth:deviceauth_build",
-         "//base/security/deviceauth:deviceauth_service_build",
-         "//base/security/deviceauth:deviceauth_sdk_build"
-      ],
-      "inner_kits": [
-        {
-          "type": "so",
-          "name": "//base/security/deviceauth/services:deviceauth_sdk",
-          "header": {
-            "header_files": [
-              "device_auth_defines.h",
-              "device_auth.h"
-            ],
-            "header_base": "//base/security/deviceauth/interfaces/innerkits"
-          }
-        }
-      ],
-      "test_list": [
-          "//base/security/deviceauth:deviceauth_test_build"
-      ]
-    }
-  }
-}

services/BUILD.gn

@@ -19,10 +19,9 @@ if (defined(ohos_lite)) {
 import("//base/security/deviceauth/deps_adapter/deviceauth_hals.gni")
 import("deviceauth.gni")
 
+include_dirs = inc_path + hals_inc_path
 if (defined(ohos_lite)) {
   static_library("deviceauth") {
-    include_dirs = inc_path
-    include_dirs += hals_inc_path
     include_dirs += [
       "//third_party/cJSON",
       "//utils/native/lite/include",
@@ -59,8 +58,6 @@ if (defined(ohos_lite)) {
 
   if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") {
     executable("deviceauth_service") {
-      include_dirs = inc_path
-      include_dirs += hals_inc_path
       include_dirs += [
         "//third_party/cJSON",
         "//utils/native/lite/include",
@@ -96,8 +93,6 @@ if (defined(ohos_lite)) {
     }
 
     shared_library("deviceauth_sdk") {
-      include_dirs = inc_path
-      include_dirs += hals_inc_path
       include_dirs += [
         "//third_party/cJSON",
         "//utils/native/lite/include",
@@ -132,9 +127,6 @@ if (defined(ohos_lite)) {
   ohos_static_library("deviceauth") {
     subsystem_name = "security"
     part_name = "deviceauth_standard"
-
-    include_dirs = inc_path
-    include_dirs += hals_inc_path
     include_dirs += [
       "//third_party/cJSON",
       "//utils/native/base/include",
@@ -180,8 +172,6 @@ if (defined(ohos_lite)) {
     part_name = "deviceauth_standard"
     install_enable = true
 
-    include_dirs = inc_path
-    include_dirs += hals_inc_path
     include_dirs += [
       "//third_party/cJSON",
       "//utils/native/base/include",
@@ -217,8 +207,6 @@ if (defined(ohos_lite)) {
     subsystem_name = "security"
     part_name = "deviceauth_standard"
 
-    include_dirs = inc_path
-    include_dirs += hals_inc_path
     include_dirs += [
       "//third_party/cJSON",
       "//utils/native/base/include",