From c6bae5957026d4c8cf1ea53050b9e1c49c7b52fc Mon Sep 17 00:00:00 2001 From: lyj_love_code Date: Mon, 2 May 2022 17:24:46 +0800 Subject: [PATCH 1/2] standalone as a component Signed-off-by: lyj_love_code --- bundle.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index e1795db0c..8be59bdb6 100644 --- a/bundle.json +++ b/bundle.json @@ -11,8 +11,8 @@ "scripts": {}, "licensePath": "COPYING", "component": { - "name": "thirdparty_curl", - "subsystem": "", + "name": "curl", + "subsystem": "thirdparty", "syscap": [], "features": [], "adapted_system_type": [], @@ -23,7 +23,9 @@ "third_party": [] }, "build": { - "sub_component": [], + "sub_component": [ + "//third_party/curl:curl" + ], "inner_kits": [], "test": [] } -- Gitee From 2b5a02893800f03fdc661dae49fdffa67bfa5bd0 Mon Sep 17 00:00:00 2001 From: lyj_love_code Date: Thu, 5 May 2022 10:57:18 +0800 Subject: [PATCH 2/2] standalone as a component Signed-off-by: lyj_love_code --- BUILD.gn | 12 ++++++++++++ bundle.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index f17e929d8..9c6e2d873 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -334,3 +334,15 @@ if (defined(ohos_lite)) { ] } } + +group("curl_target") { + if (defined(ohos_lite)) { + if (ohos_kernel_type == "liteos_m") { + deps = [ ":libcurl_static" ] + } else { + deps = [ ":libcurl_shared" ] + } + } else { + deps = [ ":curl" ] + } +} diff --git a/bundle.json b/bundle.json index 8be59bdb6..d8ee8023c 100644 --- a/bundle.json +++ b/bundle.json @@ -24,7 +24,7 @@ }, "build": { "sub_component": [ - "//third_party/curl:curl" + "//third_party/curl:curl_target" ], "inner_kits": [], "test": [] -- Gitee