aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2016-11-04 13:14:01 -0500
committerandroid-build-merger2016-11-04 13:14:01 -0500
commit99adda9d67e16e447dffc3e4b7d6505206171f69 (patch)
tree2e98105a06f173122b604ee2a52fbc5307278e11 /Android.mk
parent4f91ca78b96388cc33b197e76e01dd678ceebbae (diff)
parente2d05c565816c4dd97354ac5804200d8afa6e5fa (diff)
downloadplatform-bootable-recovery-99adda9d67e16e447dffc3e4b7d6505206171f69.tar.gz
platform-bootable-recovery-99adda9d67e16e447dffc3e4b7d6505206171f69.tar.xz
platform-bootable-recovery-99adda9d67e16e447dffc3e4b7d6505206171f69.zip
Merge "Cleanup the duplicates of logs rotation functions"
am: e2d05c5658 Change-Id: Ia63785d846ab05eca45ec1e548f7265d7feffdbb
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index dbc5603d..2943f016 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,7 @@ LOCAL_SRC_FILES := \
46 install.cpp \ 46 install.cpp \
47 recovery.cpp \ 47 recovery.cpp \
48 roots.cpp \ 48 roots.cpp \
49 rotate_logs.cpp \
49 screen_ui.cpp \ 50 screen_ui.cpp \
50 ui.cpp \ 51 ui.cpp \
51 verifier.cpp \ 52 verifier.cpp \
@@ -119,7 +120,9 @@ include $(BUILD_EXECUTABLE)
119# recovery-persist (system partition dynamic executable run after /data mounts) 120# recovery-persist (system partition dynamic executable run after /data mounts)
120# =============================== 121# ===============================
121include $(CLEAR_VARS) 122include $(CLEAR_VARS)
122LOCAL_SRC_FILES := recovery-persist.cpp 123LOCAL_SRC_FILES := \
124 recovery-persist.cpp \
125 rotate_logs.cpp
123LOCAL_MODULE := recovery-persist 126LOCAL_MODULE := recovery-persist
124LOCAL_SHARED_LIBRARIES := liblog libbase 127LOCAL_SHARED_LIBRARIES := liblog libbase
125LOCAL_CFLAGS := -Werror 128LOCAL_CFLAGS := -Werror
@@ -129,9 +132,11 @@ include $(BUILD_EXECUTABLE)
129# recovery-refresh (system partition dynamic executable run at init) 132# recovery-refresh (system partition dynamic executable run at init)
130# =============================== 133# ===============================
131include $(CLEAR_VARS) 134include $(CLEAR_VARS)
132LOCAL_SRC_FILES := recovery-refresh.cpp 135LOCAL_SRC_FILES := \
136 recovery-refresh.cpp \
137 rotate_logs.cpp
133LOCAL_MODULE := recovery-refresh 138LOCAL_MODULE := recovery-refresh
134LOCAL_SHARED_LIBRARIES := liblog 139LOCAL_SHARED_LIBRARIES := liblog libbase
135LOCAL_CFLAGS := -Werror 140LOCAL_CFLAGS := -Werror
136LOCAL_INIT_RC := recovery-refresh.rc 141LOCAL_INIT_RC := recovery-refresh.rc
137include $(BUILD_EXECUTABLE) 142include $(BUILD_EXECUTABLE)