From b521bf9dd7ec10f549f19dfb3dbaadabd3a7c0d4 Mon Sep 17 00:00:00 2001 From: borne Date: Sat, 10 Apr 2021 18:24:14 +0800 Subject: [PATCH] IssueNo:#I3EGR4 Description:Revert the release1.0.1 gn modify, branch use the build/lite/config/component/cJSON/BUILD.gn instead Feature or Bugfix:Bugfix Binary Source:No --- BUILD.gn | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index ebe1bc6..9ec2b11 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -11,19 +11,37 @@ #See the License for the specific language governing permissions and #limitations under the License. -import("//build/ohos.gni") +import("//build/lite/config/component/lite_component.gni") +import("//build/lite/ndk/ndk.gni") -config("cJSON_config") { +config("cjson_config") { include_dirs = [ "." ] + ldflags = [ "-lm" ] } -ohos_static_library("cjson_static") { - sources = [ "cJSON.c" ] - public_configs = [ ":cJSON_config" ] +cjson_sources = [ + "cJSON.c", + "cJSON_Utils.c", +] + +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" ] } -ohos_shared_library("cjson") { - deps = [ ":cjson_static" ] - public_configs = [ ":cJSON_config" ] - subsystem_name = "hiviewdfx" +ndk_lib("cjson_ndk") { + if (board_name != "hi3861v100") { + lib_extension = ".so" + deps = [ ":cjson_shared" ] + } else { + deps = [ ":cjson_static" ] + } + head_files = [ "//third_party/cJSON" ] } -- Gitee