diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-07-18 19:33:52 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-18 19:33:52 +0000 |
commit | 7d25406b602f3c7906ec3faf69a5e5a087c1b671 (patch) | |
tree | 31a81a9d9065725ab697dce1101b1ecacb95d871 | |
parent | fc053cb0934e451ddb3514ec0fb153760ac11853 (diff) | |
parent | fcc2940e964a899b23d80196f7db76c64a592256 (diff) | |
download | modp_b64-7d25406b602f3c7906ec3faf69a5e5a087c1b671.tar.gz |
Convert Android.mk to Android.bp am: a088d39af5 am: ca8a085abeandroid-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
am: fcc2940e96
Change-Id: I3e6cca84ead325f5ad9959b5ffa59b6af33c29e2
-rw-r--r-- | Android.bp | 26 | ||||
-rw-r--r-- | Android.mk | 33 |
2 files changed, 26 insertions, 33 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..9872eea --- /dev/null +++ b/Android.bp @@ -0,0 +1,26 @@ +// 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_static { + name: "libmodpb64", + host_supported: true, + srcs: ["modp_b64.cc"], + + cflags: [ + "-Wall", + "-Werror", + ], + local_include_dirs: ["modp_b64"], + export_include_dirs: ["."], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 99bce20..0000000 --- a/Android.mk +++ /dev/null @@ -1,33 +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 := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := libmodpb64 -LOCAL_SRC_FILES := modp_b64.cc -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS := -Wall -Werror -LOCAL_C_INCLUDES := $(LOCAL_PATH)/modp_b64 -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libmodpb64-host -LOCAL_SRC_FILES := modp_b64.cc -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS := -Wall -Werror -LOCAL_C_INCLUDES := $(LOCAL_PATH)/modp_b64 -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HOST_STATIC_LIBRARY) |