Snap for 7290612 from 1caf4528302ab4ba0ab82905caea172d17f87e69 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release

Change-Id: Iaeaf9de162cabc396b568186ffe09312c1bc862c

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",