From afb6b70ea42e70fa40c33599fbd221e421b17f49 Mon Sep 17 00:00:00 2001
From: CheungVane <zhangwenzhi3@huawei.com>
Date: Sat, 27 May 2023 14:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4=E6=94=B9?=
 =?UTF-8?q?=20Signed-off-by:=20zhangwenzhi=20<zhangwenzhi3@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BUILD.gn            | 20 ++++++++++++++------
 bundle.json         |  4 ++--
 compatible/BUILD.gn |  6 ++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 52a3053d72..3fc6ebbd9f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -646,6 +646,8 @@ libdefault_common_sources = [
 ]
 
 ohos_source_set("crypto_source") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   sources = [
     "crypto/aes/aes_cfb.c",
     "crypto/aes/aes_ecb.c",
@@ -1444,6 +1446,8 @@ ohos_source_set("crypto_source") {
 }
 
 ohos_static_library("libcrypto_static") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   deps = [ ":crypto_source" ]
   public_configs = [ ":crypto_config_public" ]
   complete_static_lib = true
@@ -1456,8 +1460,8 @@ if (is_mingw || is_mac) {
       libs = [ "ws2_32" ]
     }
     deps = [ ":crypto_source" ]
-    subsystem_name = "security"
-    part_name = "huks"
+    subsystem_name = "thirdparty"
+    part_name = "openssl"
     public_configs = [ ":crypto_config_public" ]
     install_images = [
       "system",
@@ -1473,8 +1477,8 @@ ohos_shared_library("libcrypto_shared") {
   }
   deps = [ ":crypto_source" ]
   output_name = "libcrypto_openssl"
-  subsystem_name = "security"
-  part_name = "huks"
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   public_configs = [ ":crypto_config_public" ]
   install_images = [
     "system",
@@ -1513,6 +1517,8 @@ config("ssl_config_public") {
 }
 
 ohos_source_set("ssl_source") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   sources = [
     "ssl/bio_ssl.c",
     "ssl/d1_lib.c",
@@ -1571,6 +1577,8 @@ ohos_source_set("ssl_source") {
 }
 
 ohos_static_library("libssl_static") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   deps = [ ":ssl_source" ]
   public_configs = [ ":ssl_config_public" ]
   complete_static_lib = true
@@ -1588,8 +1596,8 @@ ohos_shared_library("libssl_shared") {
   }
 
   output_name = "libssl_openssl"
-  subsystem_name = "developtools"
-  part_name = "profiler"
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
 
   public_configs = [
     ":crypto_config_public",
diff --git a/bundle.json b/bundle.json
index 529baf4881..ada0e8b7ff 100644
--- a/bundle.json
+++ b/bundle.json
@@ -13,8 +13,8 @@
         "en": "README.md"
     },
     "component": {
-        "name": "thirdparty_openssl",
-        "subsystem": "",
+        "name": "openssl",
+        "subsystem": "thirdparty",
         "syscap": [],
         "features": [],
         "adapted_system_type": [],
diff --git a/compatible/BUILD.gn b/compatible/BUILD.gn
index 5cb2056961..6bc2db5298 100644
--- a/compatible/BUILD.gn
+++ b/compatible/BUILD.gn
@@ -170,6 +170,8 @@ config("crypto_config_public") {
 }
 
 ohos_source_set("crypto_source_compatible") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   sources = [
     "crypto/aes/aes_cbc.c",
     "crypto/aes/aes_cfb.c",
@@ -917,6 +919,8 @@ ohos_source_set("crypto_source_compatible") {
 }
 
 ohos_static_library("libcrypto_static_compatible") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   deps = [ ":crypto_source_compatible" ]
   public_configs = [ ":crypto_config_public" ]
   complete_static_lib = true
@@ -995,6 +999,8 @@ config("ssl_config_public") {
 }
 
 ohos_source_set("ssl_source_compatible") {
+  subsystem_name = "thirdparty"
+  part_name = "openssl"
   sources = [
     "ssl/bio_ssl.c",
     "ssl/d1_lib.c",
-- 
GitLab