Merge \\"Convert libbase Android.mk to Android.bp\\" am: df252716f6
am: 3407c053c3
Change-Id: Ie9e2684c451d6591f5778ad320a8d534331ba557
This commit is contained in:
Colin Cross
android-build-merger
commit
c5ba0110d4
2 changed files with 96 additions and 140 deletions
96
base/Android.bp
Normal file
96
base/Android.bp
Normal file
|
|
@ -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",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
140
base/Android.mk
140
base/Android.mk
|
|
@ -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)
|
|
||||||
Loading…
Add table
Reference in a new issue