Merge changes I27fa4dd6,I5bd8c2d2 am: a132c70bdd am: b588547f97 am: 464d379578 am: 1caf452830android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

Original change: https://android-review.googlesource.com/c/platform/external/libwebsockets/+/1672329

Change-Id: I1eb57497998d438b0849a3621a02916c8ace3be3

1 files changed, 24 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index bda6b4eb..1e66aba2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -160,18 +160,37 @@ cc_library_static {
     srcs: libwebsocketsSrcFiles,
     local_include_dirs: libwebsocketsIncludePath,
     export_include_dirs: ["include"],
-    static_libs: ["libcrypto", "libssl", "libcap"],
+    static_libs: [
+        "libssl",
+        "libcap",
+    ],
     host_supported: true,
-    device_supported: false,
-    target: {
-        android: {
-            enabled: false,
+    product_variables: {
+        debuggable: {
+            cflags: [
+                "-UNDEBUG",
+            ],
         },
+    },
+    target: {
         darwin: {
             enabled: false,
         },
+        android: {
+            shared_libs: [
+                "libcrypto",
+            ],
+            cflags: [
+                "-Wno-unused-parameter",
+                "-Wno-missing-field-initializers",
+            ],
+        },
         host: {
+            static_libs: [
+                "libcrypto",
+            ],
             cflags: [
+                "-UNDEBUG",
                 "-Wall",
                 "-Wsign-compare",
                 "-Wstrict-aliasing",