From 403afdbed8c2a561777ae04b1488900316e2fee4 Mon Sep 17 00:00:00 2001
From: jackyetpan <jiexiwen@huawei.com>
Date: Mon, 30 Dec 2024 10:41:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?libwebsocket=20=E7=8B=AC=E7=AB=8B=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                    | 3 +++
 .idea/modules.xml                   | 8 ++++++++
 .idea/third_party_libwebsockets.iml | 9 +++++++++
 .idea/vcs.xml                       | 6 ++++++
 4 files changed, 26 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/third_party_libwebsockets.iml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..186b91df
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/third_party_libwebsockets.iml" filepath="$PROJECT_DIR$/.idea/third_party_libwebsockets.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/third_party_libwebsockets.iml b/.idea/third_party_libwebsockets.iml
new file mode 100644
index 00000000..d6ebd480
--- /dev/null
+++ b/.idea/third_party_libwebsockets.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
-- 
Gitee


From 476b7557d69bbe6f73912ce4cd6bd539b7b3b848 Mon Sep 17 00:00:00 2001
From: jackyetpan <jiexiwen@huawei.com>
Date: Mon, 30 Dec 2024 10:42:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                    | 3 ---
 .idea/modules.xml                   | 8 --------
 .idea/third_party_libwebsockets.iml | 9 ---------
 .idea/vcs.xml                       | 6 ------
 4 files changed, 26 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/third_party_libwebsockets.iml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 186b91df..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/third_party_libwebsockets.iml" filepath="$PROJECT_DIR$/.idea/third_party_libwebsockets.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/third_party_libwebsockets.iml b/.idea/third_party_libwebsockets.iml
deleted file mode 100644
index d6ebd480..00000000
--- a/.idea/third_party_libwebsockets.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
-- 
Gitee


From 6cb714e914d6c8275e1cabba9586769346ae644c Mon Sep 17 00:00:00 2001
From: jackyetpan <jiexiwen@huawei.com>
Date: Mon, 30 Dec 2024 10:53:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lizefan <lizefan3@huawei.com>
---
 BUILD.gn    | 15 +++++----------
 bundle.json | 10 ++++++----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 70eb2187..88cd30b1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -209,12 +209,6 @@ ohos_static_library("websockets") {
     "//third_party/libwebsockets/lib/roles/ws",
     "//third_party/libwebsockets/lib/roles/ws/ext",
     "//third_party/libwebsockets/lib/roles/raw-file",
-
-    #################################################
-    "//third_party/openssl/include/openssl",
-    "//third_party/openssl/crypto/evp",
-    "//third_party/glib/glib",
-    "//third_party/glib",
   ]
 
   if (target_os == "ios") {
@@ -244,11 +238,12 @@ ohos_static_library("websockets") {
     "-pipe",
   ]
 
-  deps = [
-    "//third_party/openssl:libcrypto_shared",
-    "//third_party/openssl:libssl_shared",
+  external_deps = [
+    "glib:glib",
+    "openssl:libcrypto_shared",
+    "openssl:libssl_shared",
+    "zlib:libz",
   ]
-  external_deps = [ "zlib:libz" ]
   public_configs = [ ":websockets_public_config" ]
 }
 
diff --git a/bundle.json b/bundle.json
index 06afa3b2..255dace3 100644
--- a/bundle.json
+++ b/bundle.json
@@ -19,10 +19,12 @@
     "rom": "319KB",
     "ram": "13865KB",
     "deps": {
-      "components": [ "zlib" ],
-      "third_party": [
-        "openssl"
-      ]
+      "components": [
+        "glib",
+        "openssl",
+        "zlib"
+      ],
+      "third_party": []
     },
     "build": {
       "sub_component": [],
-- 
Gitee