diff options
author | Colin Cross | 2016-05-26 18:58:28 -0500 |
---|---|---|
committer | Colin Cross | 2016-05-26 18:58:28 -0500 |
commit | b50216ed86cf1cc150baef5462bc1ea45a615895 (patch) | |
tree | f71543723b902a50c7dd9e94564fc70c0550fc9b | |
parent | ed01d17e1bf54edad1989c2da7505e0efb673a9b (diff) | |
download | platform-system-core-b50216ed86cf1cc150baef5462bc1ea45a615895.tar.gz platform-system-core-b50216ed86cf1cc150baef5462bc1ea45a615895.tar.xz platform-system-core-b50216ed86cf1cc150baef5462bc1ea45a615895.zip |
Remove deprecated Android.mk files
These directories all have Android.bp files that are always used now,
delete the Android.mk files.
Change-Id: I8b0c89072a660c4a7a30fcefc76a7bbe247df977
-rw-r--r-- | liblog/Android.mk | 85 | ||||
-rw-r--r-- | liblog/Android.soong.mk | 3 |
2 files changed, 3 insertions, 85 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk deleted file mode 100644 index b24b489aa..000000000 --- a/liblog/Android.mk +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (C) 2008-2014 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 | LOCAL_PATH := $(my-dir) | ||
17 | include $(CLEAR_VARS) | ||
18 | |||
19 | # This is what we want to do: | ||
20 | # liblog_cflags := $(shell \ | ||
21 | # sed -n \ | ||
22 | # 's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' \ | ||
23 | # $(LOCAL_PATH)/event.logtags) | ||
24 | # so make sure we do not regret hard-coding it as follows: | ||
25 | liblog_cflags := -DLIBLOG_LOG_TAG=1005 | ||
26 | liblog_cflags += -DSNET_EVENT_LOG_TAG=1397638484 | ||
27 | |||
28 | liblog_sources := log_event_list.c log_event_write.c logger_write.c | ||
29 | liblog_sources += config_write.c logger_name.c logger_lock.c | ||
30 | liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags | ||
31 | liblog_host_sources += fake_writer.c | ||
32 | liblog_target_sources := $(liblog_sources) event_tag_map.c | ||
33 | liblog_target_sources += config_read.c log_time.cpp log_is_loggable.c logprint.c | ||
34 | liblog_target_sources += pmsg_reader.c pmsg_writer.c | ||
35 | liblog_target_sources += logd_reader.c logd_writer.c logger_read.c | ||
36 | |||
37 | # Shared and static library for host | ||
38 | # ======================================================== | ||
39 | LOCAL_MODULE := liblog | ||
40 | LOCAL_SRC_FILES := $(liblog_host_sources) | ||
41 | # some files must not be compiled when building against Mingw | ||
42 | # they correspond to features not used by our host development tools | ||
43 | # which are also hard or even impossible to port to native Win32 | ||
44 | LOCAL_SRC_FILES_darwin := event_tag_map.c | ||
45 | LOCAL_SRC_FILES_linux := event_tag_map.c | ||
46 | LOCAL_SRC_FILES_windows := uio.c | ||
47 | LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror -fvisibility=hidden $(liblog_cflags) | ||
48 | LOCAL_MULTILIB := both | ||
49 | LOCAL_MODULE_HOST_OS := darwin linux windows | ||
50 | include $(BUILD_HOST_STATIC_LIBRARY) | ||
51 | |||
52 | include $(CLEAR_VARS) | ||
53 | LOCAL_MODULE := liblog | ||
54 | LOCAL_WHOLE_STATIC_LIBRARIES := liblog | ||
55 | LOCAL_LDLIBS_linux := -lrt | ||
56 | LOCAL_MULTILIB := both | ||
57 | LOCAL_CXX_STL := none | ||
58 | LOCAL_MODULE_HOST_OS := darwin linux windows | ||
59 | include $(BUILD_HOST_SHARED_LIBRARY) | ||
60 | |||
61 | |||
62 | # Shared and static library for target | ||
63 | # ======================================================== | ||
64 | include $(CLEAR_VARS) | ||
65 | LOCAL_MODULE := liblog | ||
66 | LOCAL_SRC_FILES := $(liblog_target_sources) | ||
67 | LOCAL_CFLAGS := -Werror -fvisibility=hidden $(liblog_cflags) | ||
68 | # AddressSanitizer runtime library depends on liblog. | ||
69 | LOCAL_SANITIZE := never | ||
70 | include $(BUILD_STATIC_LIBRARY) | ||
71 | |||
72 | include $(CLEAR_VARS) | ||
73 | LOCAL_MODULE := liblog | ||
74 | LOCAL_WHOLE_STATIC_LIBRARIES := liblog | ||
75 | LOCAL_CFLAGS := -Werror -fvisibility=hidden $(liblog_cflags) | ||
76 | |||
77 | # TODO: This is to work around b/24465209. Remove after root cause is fixed | ||
78 | LOCAL_LDFLAGS_arm := -Wl,--hash-style=both | ||
79 | |||
80 | LOCAL_SANITIZE := never | ||
81 | LOCAL_CXX_STL := none | ||
82 | |||
83 | include $(BUILD_SHARED_LIBRARY) | ||
84 | |||
85 | include $(call first-makefiles-under,$(LOCAL_PATH)) | ||
diff --git a/liblog/Android.soong.mk b/liblog/Android.soong.mk new file mode 100644 index 000000000..6c4dff595 --- /dev/null +++ b/liblog/Android.soong.mk | |||
@@ -0,0 +1,3 @@ | |||
1 | LOCAL_PATH := $(my-dir) | ||
2 | |||
3 | include $(call first-makefiles-under,$(LOCAL_PATH)) | ||