Merge branch 'master' of github.com:puerts/backend-nodejs

alienshengzi · Sep 3, 2022 · 44db805 · 44db805
2 parents cfac513 + b24d95f
commit 44db805
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/android-configure b/android-configure
@@ -86,7 +86,7 @@ if [ -f "configure" ]; then
         --dest-cpu=$DEST_CPU \
         --dest-os=android \
         --without-snapshot \
-        --openssl-no-asm \
+        --without-ssl \
         --partly-static \
         --with-intl=none \
         --shared \

diff --git a/android-configure-static b/android-configure-static
@@ -86,7 +86,7 @@ if [ -f "configure" ]; then
         --dest-cpu=$DEST_CPU \
         --dest-os=android \
         --without-snapshot \
-        --openssl-no-asm \
+        --without-ssl \
         --with-intl=none \
         --enable-static \
         --no-browser-globals \

diff --git a/android-static.sh b/android-static.sh
@@ -60,7 +60,6 @@ cp \
   out/Release/obj.target/deps/uv/libuv.a \
   out/Release/obj.target/deps/nghttp2/libnghttp2.a \
   out/Release/obj.target/deps/brotli/libbrotli.a \
-  out/Release/obj.target/deps/openssl/libopenssl.a \
   out/Release/obj.target/tools/v8_gypfiles/libv8_base_without_compiler.a \
   out/Release/obj.target/tools/v8_gypfiles/libv8_libbase.a \
   out/Release/obj.target/tools/v8_gypfiles/libv8_zlib.a \