summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-04-26 18:24:57 -0500
committerGerrit Code Review2017-04-26 18:24:58 -0500
commit8a85c253bfabb0fd495949cb36edf73eae9d09f2 (patch)
tree55412292274148a75416aa78cd771079fb3e5b71
parent47d15ed5b9d1eb9b1387be3f988b375e0da07925 (diff)
parent4c06e42abf0419b3d4ddd57e47d5b7864bb4be00 (diff)
downloadplatform-system-core-8a85c253bfabb0fd495949cb36edf73eae9d09f2.tar.gz
platform-system-core-8a85c253bfabb0fd495949cb36edf73eae9d09f2.tar.xz
platform-system-core-8a85c253bfabb0fd495949cb36edf73eae9d09f2.zip
Merge "libbinderwrapper: Android.mk -> Android.bp"
-rw-r--r--libbinderwrapper/Android.bp61
-rw-r--r--libbinderwrapper/Android.mk62
2 files changed, 61 insertions, 62 deletions
diff --git a/libbinderwrapper/Android.bp b/libbinderwrapper/Android.bp
new file mode 100644
index 000000000..6fac0d81a
--- /dev/null
+++ b/libbinderwrapper/Android.bp
@@ -0,0 +1,61 @@
1//
2// Copyright (C) 2015 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_defaults {
18 name: "libbinderwrapper_defaults",
19
20 cflags: [
21 "-Wall",
22 "-Werror",
23 "-Wno-unused-parameter",
24
25 // for libchrome
26 "-Wno-sign-promo",
27 ],
28 export_include_dirs: ["include"],
29 shared_libs: [
30 "libbinder",
31 "libchrome",
32 "libutils",
33 ],
34}
35
36// libbinderwrapper shared library
37// ========================================================
38cc_library_shared {
39 name: "libbinderwrapper",
40 defaults: ["libbinderwrapper_defaults"],
41
42 srcs: [
43 "binder_wrapper.cc",
44 "real_binder_wrapper.cc",
45 ],
46}
47
48// libbinderwrapper_test_support static library
49// ========================================================
50cc_library_static {
51 name: "libbinderwrapper_test_support",
52 defaults: ["libbinderwrapper_defaults"],
53
54 static_libs: ["libgtest"],
55 shared_libs: ["libbinderwrapper"],
56
57 srcs: [
58 "binder_test_base.cc",
59 "stub_binder_wrapper.cc",
60 ],
61}
diff --git a/libbinderwrapper/Android.mk b/libbinderwrapper/Android.mk
deleted file mode 100644
index c7683736b..000000000
--- a/libbinderwrapper/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
1#
2# Copyright (C) 2015 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17LOCAL_PATH := $(call my-dir)
18
19binderwrapperCommonCFlags := -Wall -Werror -Wno-unused-parameter
20binderwrapperCommonCFlags += -Wno-sign-promo # for libchrome
21binderwrapperCommonExportCIncludeDirs := $(LOCAL_PATH)/include
22binderwrapperCommonCIncludes := $(LOCAL_PATH)/include
23binderwrapperCommonSharedLibraries := \
24 libbinder \
25 libchrome \
26 libutils \
27
28# libbinderwrapper shared library
29# ========================================================
30
31include $(CLEAR_VARS)
32LOCAL_MODULE := libbinderwrapper
33LOCAL_CPP_EXTENSION := .cc
34LOCAL_CFLAGS := $(binderwrapperCommonCFlags)
35LOCAL_EXPORT_C_INCLUDE_DIRS := $(binderwrapperCommonExportCIncludeDirs)
36LOCAL_C_INCLUDES := $(binderwrapperCommonCIncludes)
37LOCAL_SHARED_LIBRARIES := $(binderwrapperCommonSharedLibraries)
38LOCAL_SRC_FILES := \
39 binder_wrapper.cc \
40 real_binder_wrapper.cc \
41
42include $(BUILD_SHARED_LIBRARY)
43
44# libbinderwrapper_test_support static library
45# ========================================================
46
47include $(CLEAR_VARS)
48LOCAL_MODULE := libbinderwrapper_test_support
49LOCAL_CPP_EXTENSION := .cc
50LOCAL_CFLAGS := $(binderwrapperCommonCFlags)
51LOCAL_EXPORT_C_INCLUDE_DIRS := $(binderwrapperCommonExportCIncludeDirs)
52LOCAL_C_INCLUDES := $(binderwrapperCommonCIncludes)
53LOCAL_STATIC_LIBRARIES := libgtest
54LOCAL_SHARED_LIBRARIES := \
55 $(binderwrapperCommonSharedLibraries) \
56 libbinderwrapper \
57
58LOCAL_SRC_FILES := \
59 binder_test_base.cc \
60 stub_binder_wrapper.cc \
61
62include $(BUILD_STATIC_LIBRARY)