diff options
author | Luum Habtemariam <luum@google.com> | 2018-07-25 10:26:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-25 10:26:25 -0700 |
commit | 5b1463bf02d02c918441009261450c9d816ec5a6 (patch) | |
tree | 8377e3a2f8a50985c9d9c7e40d649461290b4adf | |
parent | 20869c2653b242b95be85fe698b56ee139cf73dc (diff) | |
parent | 355802f3c150ada62b489a4d4bf70cb9b51a1e97 (diff) | |
download | libmicrohttpd-5b1463bf02d02c918441009261450c9d816ec5a6.tar.gz |
Update libmicrohttpd to Soong am: 58ecad0214
am: 355802f3c1
Change-Id: Ic71f514de7d013bf9302784c5340ded1501d2013
-rw-r--r-- | Android.bp | 56 | ||||
-rw-r--r-- | Android.mk | 52 |
2 files changed, 56 insertions, 52 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..89045754 --- /dev/null +++ b/Android.bp @@ -0,0 +1,56 @@ +// +// Copyright (C) 2015 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_library_shared { + + name: "libmicrohttpd", + cflags: [ + "-Wall", + "-Werror", + "-Wno-sign-compare", + "-Wno-tautological-constant-out-of-range-compare", + "-Wno-unused-parameter", + "-Wno-unused-variable", + ], + + export_include_dirs: ["src/include"], + + local_include_dirs: [ + "src/microhttpd", + ], + + shared_libs: [ + "libssl", + "libcrypto", + ], + + srcs: [ + "src/microhttpd/base64.c", + "src/microhttpd/basicauth.c", + "src/microhttpd/connection.c", + "src/microhttpd/connection_https.c", + "src/microhttpd/daemon.c", + "src/microhttpd/digestauth.c", + "src/microhttpd/internal.c", + "src/microhttpd/md5.c", + "src/microhttpd/memorypool.c", + "src/microhttpd/postprocessor.c", + "src/microhttpd/reason_phrase.c", + "src/microhttpd/response.c", + "src/microhttpd/tsearch.c", + ], + +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 84ebd2db..00000000 --- a/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -LOCAL_PATH := $(my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmicrohttpd -LOCAL_CFLAGS := \ - -Wall -Werror \ - -Wno-sign-compare \ - -Wno-tautological-constant-out-of-range-compare \ - -Wno-unused-parameter \ - -Wno-unused-variable \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/src/include \ - $(LOCAL_PATH)/src/microhttpd \ - external/boringssl/include \ - -LOCAL_SHARED_LIBRARIES := libssl libcrypto - -LOCAL_SRC_FILES := \ - src/microhttpd/base64.c \ - src/microhttpd/basicauth.c \ - src/microhttpd/connection.c \ - src/microhttpd/connection_https.c \ - src/microhttpd/daemon.c \ - src/microhttpd/digestauth.c \ - src/microhttpd/internal.c \ - src/microhttpd/md5.c \ - src/microhttpd/memorypool.c \ - src/microhttpd/postprocessor.c \ - src/microhttpd/reason_phrase.c \ - src/microhttpd/response.c \ - src/microhttpd/tsearch.c \ - -include $(BUILD_SHARED_LIBRARY) |