diff options
author | Steven Moreland <smoreland@google.com> | 2017-04-21 01:08:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-21 01:08:28 +0000 |
commit | ddc38c1219594a949cd2327d9650c987243551bd (patch) | |
tree | b0b19f00bc98624879afddf9545df7baceaaa3dc | |
parent | b225eb267957f24ca2aa2469bc78d418b2e9b795 (diff) | |
parent | b64e14f30908d644e34c5f27f0a3519b6249874b (diff) | |
download | nanopb-c-ddc38c1219594a949cd2327d9650c987243551bd.tar.gz |
libprotobuf-c-nano-enable_malloc: mk -> bp
am: b64e14f309
Change-Id: Ib764ecb01eef2004a0e6b042f09503f54e1074b6
-rw-r--r-- | Android.bp | 42 | ||||
-rw-r--r-- | Android.mk | 62 |
2 files changed, 42 insertions, 62 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..ba28c08 --- /dev/null +++ b/Android.bp @@ -0,0 +1,42 @@ +// Copyright (C) 2014 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_defaults { + name: "libprotobuf-c-nano-defaults", + cflags: [ + "-Wno-sign-compare", + "-Wno-unused-parameter", + ], + srcs: [ + "pb_decode.c", + "pb_encode.c", + ], + sdk_version: "19", + export_include_dirs: ["."], +} + +cc_library_static { + name: "libprotobuf-c-nano", + defaults: ["libprotobuf-c-nano-defaults"], +} + +cc_library_static { + name: "libprotobuf-c-nano-enable_malloc", + defaults: ["libprotobuf-c-nano-defaults"], + + cflags: ["-DPB_ENABLE_MALLOC"], +} + diff --git a/Android.mk b/Android.mk deleted file mode 100644 index dd7436a..0000000 --- a/Android.mk +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (C) 2014 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) - -IGNORED_WARNINGS := -Wno-sign-compare -Wno-unused-parameter - -# nanopb_c library -# ======================================================= -nanopb_c_src_files := \ - pb_decode.c \ - pb_encode.c - -include $(CLEAR_VARS) - -LOCAL_MODULE := libprotobuf-c-nano -LOCAL_MODULE_TAGS := optional -LOCAL_C_EXTENSION := .c -LOCAL_SRC_FILES := $(nanopb_c_src_files) -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/ \ - -LOCAL_CFLAGS := $(IGNORED_WARNINGS) - -LOCAL_SDK_VERSION := 19 - -include $(BUILD_STATIC_LIBRARY) - -# nanopb_c library with PB_ENABLE_MALLOC enabled - -include $(CLEAR_VARS) - -LOCAL_MODULE := libprotobuf-c-nano-enable_malloc -LOCAL_MODULE_TAGS := optional -LOCAL_C_EXTENSION := .c -LOCAL_SRC_FILES := $(nanopb_c_src_files) -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/ \ - -LOCAL_CFLAGS := $(IGNORED_WARNINGS) -DPB_ENABLE_MALLOC - -LOCAL_SDK_VERSION := 19 - -include $(BUILD_STATIC_LIBRARY) - -# ======================================================= - -# Clean temp vars -nanopb_c_src_files := |