diff options
author | Luum Habtemariam <luum@google.com> | 2018-10-30 14:02:04 -0700 |
---|---|---|
committer | Luum Habtemariam <luum@google.com> | 2018-10-30 14:02:04 -0700 |
commit | eb7251319569eed1c9ac34968a857da859eb8e88 (patch) | |
tree | efa4b837c4ea3f2591a7703d073f06147c38e2da | |
parent | fa5e1bc827f2afea8b2fa63e4da8683d3fb74178 (diff) | |
download | libmicrohttpd-pie-arc.tar.gz |
Update libmicrohttpd to Soongpie-arc
Migrating libmicrohttpd to new Soong build system.
Android.mk -> Android.bp
Bug: None
Test: Builds successfully
Change-Id: Ic00ef4d8094c2fe0a9509eb975083961b6c67372
(cherry picked from commit 58ecad0214b65193b88531e4c2b9ac9cedabc8c5)
-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..e65feabe --- /dev/null +++ b/Android.bp @@ -0,0 +1,56 @@ +// +// Copyright (C) 2018 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) |