commit a132c70bddbb1bdacdd28761821fe54c686eaf2e
author Yifan Hong <elsk@google.com> Thu Apr 15 21:00:03 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 15 21:00:03 2021 +0000
tree c9f2aa6ff169baaf3ce8f031fbf1364cb8c9b07a
parent b479927cc3fb2e09bc0b58c39d3b9c370282668d
parent 6b7c9eb939f49799ae7c804f8f5b78330005a326

Merge changes I27fa4dd6,I5bd8c2d2

* changes:
  Enable NDEBUG for libwebsockets on debuggable and host builds.
  Enable device build.

Android.bp

diff --git a/Android.bp b/Android.bp
index bda6b4e..1e66aba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -160,18 +160,37 @@
     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,
         },
-        host: {
+        android: {
+            shared_libs: [
+                "libcrypto",
+            ],
             cflags: [
+                "-Wno-unused-parameter",
+                "-Wno-missing-field-initializers",
+            ],
+        },
+        host: {
+            static_libs: [
+                "libcrypto",
+            ],
+            cflags: [
+                "-UNDEBUG",
                 "-Wall",
                 "-Wsign-compare",
                 "-Wstrict-aliasing",