diff options
author | Tianjie Xu | 2016-11-04 13:14:01 -0500 |
---|---|---|
committer | android-build-merger | 2016-11-04 13:14:01 -0500 |
commit | 99adda9d67e16e447dffc3e4b7d6505206171f69 (patch) | |
tree | 2e98105a06f173122b604ee2a52fbc5307278e11 /Android.mk | |
parent | 4f91ca78b96388cc33b197e76e01dd678ceebbae (diff) | |
parent | e2d05c565816c4dd97354ac5804200d8afa6e5fa (diff) | |
download | platform-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.mk | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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 | # =============================== |
121 | include $(CLEAR_VARS) | 122 | include $(CLEAR_VARS) |
122 | LOCAL_SRC_FILES := recovery-persist.cpp | 123 | LOCAL_SRC_FILES := \ |
124 | recovery-persist.cpp \ | ||
125 | rotate_logs.cpp | ||
123 | LOCAL_MODULE := recovery-persist | 126 | LOCAL_MODULE := recovery-persist |
124 | LOCAL_SHARED_LIBRARIES := liblog libbase | 127 | LOCAL_SHARED_LIBRARIES := liblog libbase |
125 | LOCAL_CFLAGS := -Werror | 128 | LOCAL_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 | # =============================== |
131 | include $(CLEAR_VARS) | 134 | include $(CLEAR_VARS) |
132 | LOCAL_SRC_FILES := recovery-refresh.cpp | 135 | LOCAL_SRC_FILES := \ |
136 | recovery-refresh.cpp \ | ||
137 | rotate_logs.cpp | ||
133 | LOCAL_MODULE := recovery-refresh | 138 | LOCAL_MODULE := recovery-refresh |
134 | LOCAL_SHARED_LIBRARIES := liblog | 139 | LOCAL_SHARED_LIBRARIES := liblog libbase |
135 | LOCAL_CFLAGS := -Werror | 140 | LOCAL_CFLAGS := -Werror |
136 | LOCAL_INIT_RC := recovery-refresh.rc | 141 | LOCAL_INIT_RC := recovery-refresh.rc |
137 | include $(BUILD_EXECUTABLE) | 142 | include $(BUILD_EXECUTABLE) |