diff options
author | Colin Cross <ccross@android.com> | 2016-07-11 14:15:31 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-07-11 14:23:32 -0700 |
commit | fc06bd0ca3e8262cc5f46eb97eb6bda15340f58d (patch) | |
tree | fca82f4a8c8ab48ee7c2ef447576d768cfc2d57b | |
parent | 82d2bcc21e4a9cc347c9c0598e12b2419561db0b (diff) | |
download | core-fc06bd0ca3e8262cc5f46eb97eb6bda15340f58d.tar.gz |
Convert libbase Android.mk to Android.bp
Change-Id: I429d0a06c5138c3e54c9d25f15adb3e2647496e1
-rw-r--r-- | base/Android.bp | 96 | ||||
-rw-r--r-- | base/Android.mk | 140 |
2 files changed, 96 insertions, 140 deletions
diff --git a/base/Android.bp b/base/Android.bp new file mode 100644 index 000000000..7bf4c79a6 --- /dev/null +++ b/base/Android.bp @@ -0,0 +1,96 @@ +// +// 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. +// + +libbase_cppflags = [ + "-Wall", + "-Wextra", + "-Werror", +] + +cc_library { + name: "libbase", + clang: true, + host_supported: true, + srcs: [ + "file.cpp", + "logging.cpp", + "parsenetaddress.cpp", + "stringprintf.cpp", + "strings.cpp", + "test_utils.cpp", + ], + local_include_dirs: ["include"], + cppflags: libbase_cppflags, + export_include_dirs: ["include"], + shared_libs: ["liblog"], + target: { + android: { + srcs: ["errors_unix.cpp"], + cppflags: ["-Wexit-time-destructors"], + }, + darwin: { + srcs: ["errors_unix.cpp"], + cppflags: ["-Wexit-time-destructors"], + }, + linux: { + srcs: ["errors_unix.cpp"], + cppflags: ["-Wexit-time-destructors"], + }, + windows: { + srcs: [ + "errors_windows.cpp", + "utf8.cpp", + ], + enabled: true, + }, + }, +} + +// Tests +// ------------------------------------------------------------------------------ +cc_test { + name: "libbase_test", + host_supported: true, + clang: true, + srcs: [ + "errors_test.cpp", + "file_test.cpp", + "logging_test.cpp", + "parseint_test.cpp", + "parsenetaddress_test.cpp", + "stringprintf_test.cpp", + "strings_test.cpp", + "test_main.cpp", + ], + target: { + windows: { + srcs: ["utf8_test.cpp"], + enabled: true, + }, + }, + local_include_dirs: ["."], + cppflags: libbase_cppflags, + shared_libs: ["libbase"], + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, + }, +} diff --git a/base/Android.mk b/base/Android.mk deleted file mode 100644 index 1693e7411..000000000 --- a/base/Android.mk +++ /dev/null @@ -1,140 +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) - -libbase_src_files := \ - file.cpp \ - logging.cpp \ - parsenetaddress.cpp \ - stringprintf.cpp \ - strings.cpp \ - test_utils.cpp \ - -libbase_linux_src_files := \ - errors_unix.cpp \ - -libbase_darwin_src_files := \ - errors_unix.cpp \ - -libbase_windows_src_files := \ - errors_windows.cpp \ - utf8.cpp \ - -libbase_test_src_files := \ - errors_test.cpp \ - file_test.cpp \ - logging_test.cpp \ - parseint_test.cpp \ - parsenetaddress_test.cpp \ - stringprintf_test.cpp \ - strings_test.cpp \ - test_main.cpp \ - -libbase_test_windows_src_files := \ - utf8_test.cpp \ - -libbase_cppflags := \ - -Wall \ - -Wextra \ - -Werror \ - -libbase_linux_cppflags := \ - -Wexit-time-destructors \ - -libbase_darwin_cppflags := \ - -Wexit-time-destructors \ - -# Device -# ------------------------------------------------------------------------------ -include $(CLEAR_VARS) -LOCAL_MODULE := libbase -LOCAL_CLANG := true -LOCAL_SRC_FILES := $(libbase_src_files) $(libbase_linux_src_files) -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CPPFLAGS := $(libbase_cppflags) $(libbase_linux_cppflags) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_MULTILIB := both -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libbase -LOCAL_CLANG := true -LOCAL_WHOLE_STATIC_LIBRARIES := libbase -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_MULTILIB := both -include $(BUILD_SHARED_LIBRARY) - -# Host -# ------------------------------------------------------------------------------ -include $(CLEAR_VARS) -LOCAL_MODULE := libbase -LOCAL_SRC_FILES := $(libbase_src_files) -LOCAL_SRC_FILES_darwin := $(libbase_darwin_src_files) -LOCAL_SRC_FILES_linux := $(libbase_linux_src_files) -LOCAL_SRC_FILES_windows := $(libbase_windows_src_files) -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_CPPFLAGS := $(libbase_cppflags) -LOCAL_CPPFLAGS_darwin := $(libbase_darwin_cppflags) -LOCAL_CPPFLAGS_linux := $(libbase_linux_cppflags) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_MULTILIB := both -LOCAL_MODULE_HOST_OS := darwin linux windows -include $(BUILD_HOST_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libbase -LOCAL_WHOLE_STATIC_LIBRARIES := libbase -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_MULTILIB := both -LOCAL_MODULE_HOST_OS := darwin linux windows -include $(BUILD_HOST_SHARED_LIBRARY) - -# Tests -# ------------------------------------------------------------------------------ -include $(CLEAR_VARS) -LOCAL_MODULE := libbase_test -LOCAL_CLANG := true -LOCAL_SRC_FILES := $(libbase_test_src_files) -LOCAL_SRC_FILES_darwin := $(libbase_test_darwin_src_files) -LOCAL_SRC_FILES_linux := $(libbase_test_linux_src_files) -LOCAL_SRC_FILES_windows := $(libbase_test_windows_src_files) -LOCAL_C_INCLUDES := $(LOCAL_PATH) -LOCAL_CPPFLAGS := $(libbase_cppflags) -LOCAL_SHARED_LIBRARIES := libbase -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 -LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -include $(BUILD_NATIVE_TEST) - -include $(CLEAR_VARS) -LOCAL_MODULE := libbase_test -LOCAL_MODULE_HOST_OS := darwin linux windows -LOCAL_SRC_FILES := $(libbase_test_src_files) -LOCAL_SRC_FILES_darwin := $(libbase_test_darwin_src_files) -LOCAL_SRC_FILES_linux := $(libbase_test_linux_src_files) -LOCAL_SRC_FILES_windows := $(libbase_test_windows_src_files) -LOCAL_C_INCLUDES := $(LOCAL_PATH) -LOCAL_CPPFLAGS := $(libbase_cppflags) -LOCAL_SHARED_LIBRARIES := libbase -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 -LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -include $(BUILD_HOST_NATIVE_TEST) |