From 7b6a299a5888845858f67089907554d7374c3681 Mon Sep 17 00:00:00 2001
From: scyhssm <347966819@qq.com>
Date: Tue, 18 May 2021 17:07:09 +0800
Subject: [PATCH 1/2] sync diff with L2

---
 BUILD.gn | 57 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index ebe1bc6..c0ae251 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,19 +11,50 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 
-import("//build/ohos.gni")
+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" ]
+  }
+  cjson_sources = [
+    "cJSON.c",
+    "cJSON_Utils.c",
+  ]
 
-config("cJSON_config") {
-  include_dirs = [ "." ]
+  lite_library("cjson_static") {
+    target_type = "static_library"
+    sources = cjson_sources
+    public_configs = [ ":cjson_config" ]
+  }
+  lite_library("cjson_shared") {
+    target_type = "shared_library"
+    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") {
+    include_dirs = [ "." ]
+  }
+  ohos_static_library("cjson_static") {
+    sources = [ "cJSON.c" ]
+    public_configs = [ ":cJSON_config" ]
+  }
+  ohos_shared_library("cjson") {
+    deps = [ ":cjson_static" ]
+    public_configs = [ ":cjson_config" ]
+    subsystem_name = "hiviewdfx"
+  }
 }
 
-ohos_static_library("cjson_static") {
-  sources = [ "cJSON.c" ]
-  public_configs = [ ":cJSON_config" ]
-}
-
-ohos_shared_library("cjson") {
-  deps = [ ":cjson_static" ]
-  public_configs = [ ":cJSON_config" ]
-  subsystem_name = "hiviewdfx"
-}
-- 
Gitee


From 068021e62d8254591b3e2b2dade72cd20428f281 Mon Sep 17 00:00:00 2001
From: songcy-hw <songcongyi1@huawei.com>
Date: Thu, 20 May 2021 14:12:48 +0800
Subject: [PATCH 2/2] update BUILD.gn.

---
 BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index c0ae251..31ff390 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -53,7 +53,7 @@ if (defined(ohos_lite)) {
   }
   ohos_shared_library("cjson") {
     deps = [ ":cjson_static" ]
-    public_configs = [ ":cjson_config" ]
+    public_configs = [ ":cJSON_config" ]
     subsystem_name = "hiviewdfx"
   }
 }
-- 
Gitee