diff options
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | minadbd/Android.bp | 78 | ||||
-rw-r--r-- | minadbd/Android.mk | 55 |
3 files changed, 78 insertions, 56 deletions
@@ -259,7 +259,6 @@ include $(BUILD_STATIC_LIBRARY) | |||
259 | 259 | ||
260 | include \ | 260 | include \ |
261 | $(LOCAL_PATH)/boot_control/Android.mk \ | 261 | $(LOCAL_PATH)/boot_control/Android.mk \ |
262 | $(LOCAL_PATH)/minadbd/Android.mk \ | ||
263 | $(LOCAL_PATH)/minui/Android.mk \ | 262 | $(LOCAL_PATH)/minui/Android.mk \ |
264 | $(LOCAL_PATH)/tests/Android.mk \ | 263 | $(LOCAL_PATH)/tests/Android.mk \ |
265 | $(LOCAL_PATH)/tools/Android.mk \ | 264 | $(LOCAL_PATH)/tools/Android.mk \ |
diff --git a/minadbd/Android.bp b/minadbd/Android.bp new file mode 100644 index 00000000..fcdb4827 --- /dev/null +++ b/minadbd/Android.bp | |||
@@ -0,0 +1,78 @@ | |||
1 | // Copyright (C) 2018 The Android Open Source Project | ||
2 | // | ||
3 | // Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | // you may not use this file except in compliance with the License. | ||
5 | // You may obtain a copy of the License at | ||
6 | // | ||
7 | // http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | // | ||
9 | // Unless required by applicable law or agreed to in writing, software | ||
10 | // distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | // See the License for the specific language governing permissions and | ||
13 | // limitations under the License. | ||
14 | |||
15 | cc_defaults { | ||
16 | name: "minadbd_defaults", | ||
17 | |||
18 | cflags: [ | ||
19 | "-DADB_HOST=0", | ||
20 | "-Wall", | ||
21 | "-Werror", | ||
22 | ], | ||
23 | |||
24 | include_dirs: [ | ||
25 | "bootable/recovery", | ||
26 | "system/core/adb", | ||
27 | ], | ||
28 | } | ||
29 | |||
30 | cc_library_static { | ||
31 | name: "libminadbd", | ||
32 | |||
33 | defaults: [ | ||
34 | "minadbd_defaults", | ||
35 | ], | ||
36 | |||
37 | srcs: [ | ||
38 | "fuse_adb_provider.cpp", | ||
39 | "minadbd.cpp", | ||
40 | "minadbd_services.cpp", | ||
41 | ], | ||
42 | |||
43 | static_libs: [ | ||
44 | "libbase", | ||
45 | "libcrypto", | ||
46 | ], | ||
47 | |||
48 | whole_static_libs: [ | ||
49 | "libadbd", | ||
50 | ], | ||
51 | } | ||
52 | |||
53 | cc_test { | ||
54 | name: "minadbd_test", | ||
55 | |||
56 | defaults: [ | ||
57 | "minadbd_defaults", | ||
58 | ], | ||
59 | |||
60 | srcs: [ | ||
61 | "fuse_adb_provider_test.cpp", | ||
62 | ], | ||
63 | |||
64 | static_libs: [ | ||
65 | "libBionicGtestMain", | ||
66 | "libminadbd", | ||
67 | ], | ||
68 | |||
69 | shared_libs: [ | ||
70 | "libbase", | ||
71 | "libcutils", | ||
72 | "liblog", | ||
73 | ], | ||
74 | |||
75 | test_suites: [ | ||
76 | "device-tests", | ||
77 | ], | ||
78 | } | ||
diff --git a/minadbd/Android.mk b/minadbd/Android.mk deleted file mode 100644 index 50e3b34e..00000000 --- a/minadbd/Android.mk +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | # Copyright 2005 The Android Open Source Project | ||
2 | # | ||
3 | # Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | # you may not use this file except in compliance with the License. | ||
5 | # You may obtain a copy of the License at | ||
6 | # | ||
7 | # http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | # | ||
9 | # Unless required by applicable law or agreed to in writing, software | ||
10 | # distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | # See the License for the specific language governing permissions and | ||
13 | # limitations under the License. | ||
14 | |||
15 | LOCAL_PATH:= $(call my-dir) | ||
16 | |||
17 | minadbd_cflags := \ | ||
18 | -Wall -Werror \ | ||
19 | -DADB_HOST=0 \ | ||
20 | |||
21 | # libminadbd (static library) | ||
22 | # =============================== | ||
23 | include $(CLEAR_VARS) | ||
24 | |||
25 | LOCAL_SRC_FILES := \ | ||
26 | fuse_adb_provider.cpp \ | ||
27 | minadbd.cpp \ | ||
28 | minadbd_services.cpp \ | ||
29 | |||
30 | LOCAL_MODULE := libminadbd | ||
31 | LOCAL_CFLAGS := $(minadbd_cflags) | ||
32 | LOCAL_C_INCLUDES := bootable/recovery system/core/adb | ||
33 | LOCAL_WHOLE_STATIC_LIBRARIES := libadbd | ||
34 | LOCAL_STATIC_LIBRARIES := libcrypto libbase | ||
35 | |||
36 | include $(BUILD_STATIC_LIBRARY) | ||
37 | |||
38 | # minadbd_test (native test) | ||
39 | # =============================== | ||
40 | include $(CLEAR_VARS) | ||
41 | |||
42 | LOCAL_MODULE := minadbd_test | ||
43 | LOCAL_COMPATIBILITY_SUITE := device-tests | ||
44 | LOCAL_SRC_FILES := fuse_adb_provider_test.cpp | ||
45 | LOCAL_CFLAGS := $(minadbd_cflags) | ||
46 | LOCAL_C_INCLUDES := $(LOCAL_PATH) system/core/adb | ||
47 | LOCAL_STATIC_LIBRARIES := \ | ||
48 | libBionicGtestMain \ | ||
49 | libminadbd | ||
50 | LOCAL_SHARED_LIBRARIES := \ | ||
51 | liblog \ | ||
52 | libbase \ | ||
53 | libcutils | ||
54 | |||
55 | include $(BUILD_NATIVE_TEST) | ||