From 0ccc27301c95e6adc86f8f007577fba5c8a0c05f Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 03:46:21 +0000 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86bundle.json?= =?UTF-8?q?=E5=92=8CBUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 11 ++++++++--- bundle.json | 9 +++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 3770b31..dc20d7c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -40,19 +40,19 @@ if (defined(ohos_lite)) { } } else { import("//build/ohos.gni") - config("cJSON_config") { + config("cjson_config") { include_dirs = [ "." ] defines = [ "CJSON_NESTING_LIMIT=(128)" ] } ohos_static_library("cjson_static") { sources = [ "cJSON.c" ] - public_configs = [ ":cJSON_config" ] + public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } ohos_shared_library("cjson") { deps = [ ":cjson_static" ] - public_configs = [ ":cJSON_config" ] + public_configs = [ ":cjson_config" ] innerapi_tags = [ "chipsetsdk", "platformsdk_indirect", @@ -64,4 +64,9 @@ if (defined(ohos_lite)) { "updater", ] } + ohos_shared_library("cJSON_config") { + public_configs = [ ":cjson_config" ] + part_name = "cJSON" + subsystem_name = "thirdparty" + } } diff --git a/bundle.json b/bundle.json index a69eb4e..3be3106 100644 --- a/bundle.json +++ b/bundle.json @@ -45,6 +45,15 @@ ], "header_base": "//third_party/cJSON" } + }, + { + "name": "//third_party/cJSON:cJSON_config", + "header": { + "header_files": [ + "cJSON.h" + ], + "header_base": "//third_party/cJSON" + } } ], "test": [] -- Gitee From 93ec4921e73b196f9c2fbcbba31dfec2e6230117 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 07:19:10 +0000 Subject: [PATCH 02/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index dc20d7c..d66b337 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -65,6 +65,7 @@ if (defined(ohos_lite)) { ] } ohos_shared_library("cJSON_config") { + deps = [ ":cjson_static" ] public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" -- Gitee From 9b205ff58f9df624363b756e9a5d00fe558bf30d Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 07:55:33 +0000 Subject: [PATCH 03/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index d66b337..ad39c7d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -40,19 +40,19 @@ if (defined(ohos_lite)) { } } else { import("//build/ohos.gni") - config("cjson_config") { + config("CJSON_config") { include_dirs = [ "." ] defines = [ "CJSON_NESTING_LIMIT=(128)" ] } ohos_static_library("cjson_static") { sources = [ "cJSON.c" ] - public_configs = [ ":cjson_config" ] + public_configs = [ ":CJSON_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } ohos_shared_library("cjson") { deps = [ ":cjson_static" ] - public_configs = [ ":cjson_config" ] + public_configs = [ ":CJSON_config" ] innerapi_tags = [ "chipsetsdk", "platformsdk_indirect", @@ -65,8 +65,7 @@ if (defined(ohos_lite)) { ] } ohos_shared_library("cJSON_config") { - deps = [ ":cjson_static" ] - public_configs = [ ":cjson_config" ] + public_configs = [ ":CJSON_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } -- Gitee From 16e123de6657f8bd746f5dfa5f6336f3db85b2dc Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 08:24:30 +0000 Subject: [PATCH 04/13] update bundle.json. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- bundle.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bundle.json b/bundle.json index 3be3106..a69eb4e 100644 --- a/bundle.json +++ b/bundle.json @@ -45,15 +45,6 @@ ], "header_base": "//third_party/cJSON" } - }, - { - "name": "//third_party/cJSON:cJSON_config", - "header": { - "header_files": [ - "cJSON.h" - ], - "header_base": "//third_party/cJSON" - } } ], "test": [] -- Gitee From dda13fbeb6df7303d5d48b11af96cf3713acfdeb Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 11:07:35 +0000 Subject: [PATCH 05/13] update bundle.json. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- bundle.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bundle.json b/bundle.json index a69eb4e..3be3106 100644 --- a/bundle.json +++ b/bundle.json @@ -45,6 +45,15 @@ ], "header_base": "//third_party/cJSON" } + }, + { + "name": "//third_party/cJSON:cJSON_config", + "header": { + "header_files": [ + "cJSON.h" + ], + "header_base": "//third_party/cJSON" + } } ], "test": [] -- Gitee From b0417db0de2efac4804ae7dcf7aa48487479529e Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 11:10:00 +0000 Subject: [PATCH 06/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ad39c7d..d25bf8a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -40,19 +40,24 @@ if (defined(ohos_lite)) { } } else { import("//build/ohos.gni") - config("CJSON_config") { + config("Cjson_config") { include_dirs = [ "." ] defines = [ "CJSON_NESTING_LIMIT=(128)" ] } ohos_static_library("cjson_static") { sources = [ "cJSON.c" ] - public_configs = [ ":CJSON_config" ] + public_configs = [ ":Cjson_config" ] + part_name = "cJSON" + subsystem_name = "thirdparty" + } + ohos_shared_library("cJSON_config") { + public_configs = [ ":Cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } ohos_shared_library("cjson") { - deps = [ ":cjson_static" ] - public_configs = [ ":CJSON_config" ] + deps = [ ":cjson_static", "cjson_config" ] + public_configs = [ ":cjson_config" ] innerapi_tags = [ "chipsetsdk", "platformsdk_indirect", @@ -64,9 +69,4 @@ if (defined(ohos_lite)) { "updater", ] } - ohos_shared_library("cJSON_config") { - public_configs = [ ":CJSON_config" ] - part_name = "cJSON" - subsystem_name = "thirdparty" - } } -- Gitee From 31bfba5aaad0bf69a461796a42d34728a4151f45 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 11:25:09 +0000 Subject: [PATCH 07/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index d25bf8a..49c85fb 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -56,7 +56,7 @@ if (defined(ohos_lite)) { subsystem_name = "thirdparty" } ohos_shared_library("cjson") { - deps = [ ":cjson_static", "cjson_config" ] + deps = [ ":cjson_static", ":cjson_config" ] public_configs = [ ":cjson_config" ] innerapi_tags = [ "chipsetsdk", -- Gitee From 4fdbe30dee0b4a66eea03771554b5df186a41d35 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 11:29:45 +0000 Subject: [PATCH 08/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 49c85fb..ac0cdbd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -56,7 +56,7 @@ if (defined(ohos_lite)) { subsystem_name = "thirdparty" } ohos_shared_library("cjson") { - deps = [ ":cjson_static", ":cjson_config" ] + deps = [ ":cjson_static", ":cJSON_config" ] public_configs = [ ":cjson_config" ] innerapi_tags = [ "chipsetsdk", -- Gitee From e407844edb1d3e266bc3c2ef313a68f2def989bb Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Tue, 20 Feb 2024 12:06:11 +0000 Subject: [PATCH 09/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ac0cdbd..bcbf691 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -40,18 +40,18 @@ if (defined(ohos_lite)) { } } else { import("//build/ohos.gni") - config("Cjson_config") { + config("cjson_config") { include_dirs = [ "." ] defines = [ "CJSON_NESTING_LIMIT=(128)" ] } ohos_static_library("cjson_static") { sources = [ "cJSON.c" ] - public_configs = [ ":Cjson_config" ] + public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } ohos_shared_library("cJSON_config") { - public_configs = [ ":Cjson_config" ] + public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" } -- Gitee From e69ac3454eca7ac6c489de8dd2416f8b49069062 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Wed, 21 Feb 2024 02:05:46 +0000 Subject: [PATCH 10/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index bcbf691..95957db 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -56,7 +56,8 @@ if (defined(ohos_lite)) { subsystem_name = "thirdparty" } ohos_shared_library("cjson") { - deps = [ ":cjson_static", ":cJSON_config" ] + deps = [ ":cjson_static" ] + deps += [ ":cJSON_config" ] public_configs = [ ":cjson_config" ] innerapi_tags = [ "chipsetsdk", -- Gitee From 9986d2b09cd27050e1a9d159d844fca4906ee914 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Wed, 21 Feb 2024 03:27:30 +0000 Subject: [PATCH 11/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 95957db..e1409ac 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -51,6 +51,7 @@ if (defined(ohos_lite)) { subsystem_name = "thirdparty" } ohos_shared_library("cJSON_config") { + sources = [ "cJSON.c" ] public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" -- Gitee From b4987b3048e7b23fcf194ca3e82184e815f111d2 Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Fri, 23 Feb 2024 06:28:06 +0000 Subject: [PATCH 12/13] update BUILD.gn. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 4cb8273..2ac802e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -51,7 +51,6 @@ if (defined(ohos_lite)) { subsystem_name = "thirdparty" } ohos_shared_library("cJSON_config") { - sources = [ "cJSON.c" ] public_configs = [ ":cjson_config" ] part_name = "cJSON" subsystem_name = "thirdparty" -- Gitee From 80a06c0d90e92aa7bfdfc22f94c92fe08b33f83c Mon Sep 17 00:00:00 2001 From: xingyuanfeng <1292110408@qq.com> Date: Fri, 23 Feb 2024 07:24:01 +0000 Subject: [PATCH 13/13] update bundle.json. Signed-off-by: xingyuanfeng <1292110408@qq.com> --- bundle.json | 1 - 1 file changed, 1 deletion(-) diff --git a/bundle.json b/bundle.json index 2100591..0b99877 100644 --- a/bundle.json +++ b/bundle.json @@ -37,7 +37,6 @@ "header_base": "//third_party/cJSON" } }, - { "name": "//third_party/cJSON:cJSON_config", "header": { -- Gitee