diff options
author | Yifan Hong <elsk@google.com> | 2021-04-15 23:09:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-15 23:09:42 +0000 |
commit | 1caf4528302ab4ba0ab82905caea172d17f87e69 (patch) | |
tree | c9f2aa6ff169baaf3ce8f031fbf1364cb8c9b07a | |
parent | a22ec997d2e32264fd3ff752a4163c30337d84ff (diff) | |
parent | 464d3795780be5080b9ce1aa064964270a21d4b2 (diff) | |
download | libwebsockets-android12-qpr3-release.tar.gz |
Merge changes I27fa4dd6,I5bd8c2d2 am: a132c70bdd am: b588547f97 am: 464d379578android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/external/libwebsockets/+/1672329
Change-Id: Ia520c59a849798ede99060aad905f03abcc75bac
-rw-r--r-- | Android.bp | 29 |
1 files changed, 24 insertions, 5 deletions
@@ -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", |