diff options
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | installcommand.cpp | 1 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 4 | ||||
| -rw-r--r-- | rotate_logs.cpp | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 7338adfed..151be4163 100644 --- a/Android.mk +++ b/Android.mk @@ -558,7 +558,9 @@ endif # !TW_USE_TOOLBOX # =============================== ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0) include $(CLEAR_VARS) - LOCAL_SRC_FILES := recovery-persist.cpp + LOCAL_SRC_FILES := \ + recovery-persist.cpp \ + rotate_logs.cpp LOCAL_MODULE := recovery-persist LOCAL_SHARED_LIBRARIES := liblog libbase LOCAL_CFLAGS := -Werror @@ -570,9 +572,11 @@ endif # =============================== ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0) include $(CLEAR_VARS) - LOCAL_SRC_FILES := recovery-refresh.cpp + LOCAL_SRC_FILES := \ + recovery-refresh.cpp \ + rotate_logs.cpp LOCAL_MODULE := recovery-refresh - LOCAL_SHARED_LIBRARIES := liblog + LOCAL_SHARED_LIBRARIES := liblog libbase LOCAL_CFLAGS := -Werror LOCAL_INIT_RC := recovery-refresh.rc include $(BUILD_EXECUTABLE) diff --git a/installcommand.cpp b/installcommand.cpp index c6b192694..f9978f27b 100644 --- a/installcommand.cpp +++ b/installcommand.cpp @@ -19,6 +19,7 @@ #include <vector> #ifdef AB_OTA_UPDATER +#include <inttypes.h> #include <map> #include <android-base/parseint.h> #include <android-base/stringprintf.h> diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index c1258d1f3..93ae610bf 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -257,6 +257,10 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcrecpp.so endif + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/liblogcat.so + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcap.so + endif endif ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre2.so diff --git a/rotate_logs.cpp b/rotate_logs.cpp index fc220215e..51557b105 100644 --- a/rotate_logs.cpp +++ b/rotate_logs.cpp @@ -74,7 +74,7 @@ ssize_t logrotate( name += ".1"; } else { size_t i; - if (!android::base::ParseUint(number, &i)) { + if (!android::base::ParseUint(number.c_str(), &i)) { LOG(ERROR) << "failed to parse uint in " << number; return -1; } |