From 46c4ed79b813fe649ed4ac47cb5467d1aacfd67a Mon Sep 17 00:00:00 2001
From: "taiyi.pei" <peitaiyi@huawei.com>
Date: Mon, 4 Jul 2022 15:29:17 +0800
Subject: [PATCH] correct part and subsystem name

Signed-off-by: taiyi.pei <peitaiyi@huawei.com>
---
 BUILD.gn    | 23 +++++++----------------
 bundle.json |  6 +++---
 2 files changed, 10 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
old mode 100755
new mode 100644
index 4280f84..3648cad
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,8 +12,6 @@
 #limitations under the License.
 
 if (defined(ohos_lite)) {
-  import("//build/lite/config/component/lite_component.gni")
-  import("//build/lite/ndk/ndk.gni")
   config("cjson_config") {
     include_dirs = [ "." ]
     ldflags = [ "-lm" ]
@@ -23,25 +21,15 @@ if (defined(ohos_lite)) {
     "cJSON_Utils.c",
   ]
 
-  lite_library("cjson_static") {
-    target_type = "static_library"
+  static_library("cjson_static") {
     sources = cjson_sources
     public_configs = [ ":cjson_config" ]
   }
-  lite_library("cjson_shared") {
-    target_type = "shared_library"
+
+  shared_library("cjson_shared") {
     sources = cjson_sources
     public_configs = [ ":cjson_config" ]
   }
-  ndk_lib("cjson_ndk") {
-    if (board_name != "hi3861v100") {
-      lib_extension = ".so"
-      deps = [ ":cjson_shared" ]
-    } else {
-      deps = [ ":cjson_static" ]
-    }
-    head_files = [ "//third_party/cJSON" ]
-  }
 } else {
   import("//build/ohos.gni")
   config("cJSON_config") {
@@ -50,10 +38,13 @@ if (defined(ohos_lite)) {
   ohos_static_library("cjson_static") {
     sources = [ "cJSON.c" ]
     public_configs = [ ":cJSON_config" ]
+    part_name = "cjson"
+    subsystem_name = "thirdparty"
   }
   ohos_shared_library("cjson") {
     deps = [ ":cjson_static" ]
     public_configs = [ ":cJSON_config" ]
-    subsystem_name = "hiviewdfx"
+    part_name = "cjson"
+    subsystem_name = "thirdparty"
   }
 }
diff --git a/bundle.json b/bundle.json
index f53a350..1f71746 100644
--- a/bundle.json
+++ b/bundle.json
@@ -10,11 +10,11 @@
     "dirs": {},
     "scripts": {},
     "component": {
-        "name": "thirdparty_cjson",
-        "subsystem": "",
+        "name": "cjson",
+        "subsystem": "thirdparty",
         "syscap": [],
         "features": [],
-        "adapted_system_type": [],
+        "adapted_system_type": [ "mini", "small", "standard" ],
         "rom": "",
         "ram": "",
         "deps": {
-- 
Gitee