Fix a few build errors (d9918b7c) · Commits · e / tools / etwrp

Android.mk

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -558,7 +558,9 @@ endif # !TW_USE_TOOLBOX
	# ===============================		# ===============================
	ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_SRC_FILES := recovery-persist.cpp		LOCAL_SRC_FILES := \
			recovery-persist.cpp \
			rotate_logs.cpp
	LOCAL_MODULE := recovery-persist		LOCAL_MODULE := recovery-persist
	LOCAL_SHARED_LIBRARIES := liblog libbase		LOCAL_SHARED_LIBRARIES := liblog libbase
	LOCAL_CFLAGS := -Werror		LOCAL_CFLAGS := -Werror
	@@ -570,9 +572,11 @@ endif
	# ===============================		# ===============================
	ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_SRC_FILES := recovery-refresh.cpp		LOCAL_SRC_FILES := \
			recovery-refresh.cpp \
			rotate_logs.cpp
	LOCAL_MODULE := recovery-refresh		LOCAL_MODULE := recovery-refresh
	LOCAL_SHARED_LIBRARIES := liblog		LOCAL_SHARED_LIBRARIES := liblog libbase
	LOCAL_CFLAGS := -Werror		LOCAL_CFLAGS := -Werror
	LOCAL_INIT_RC := recovery-refresh.rc		LOCAL_INIT_RC := recovery-refresh.rc
	include $(BUILD_EXECUTABLE)		include $(BUILD_EXECUTABLE)

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <vector>		#include <vector>

	#ifdef AB_OTA_UPDATER		#ifdef AB_OTA_UPDATER
			#include <inttypes.h>
	#include <map>		#include <map>
	#include <android-base/parseint.h>		#include <android-base/parseint.h>
	#include <android-base/stringprintf.h>		#include <android-base/stringprintf.h>

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -257,6 +257,10 @@ ifeq ($(TWRP_INCLUDE_LOGCAT), true)
	ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)
	RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcrecpp.so		RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcrecpp.so
	endif		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		endif
	ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)		ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 25; echo $$?),0)
	RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre2.so		RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre2.so

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ ssize_t logrotate(
	name += ".1";		name += ".1";
	} else {		} else {
	size_t i;		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;		LOG(ERROR) << "failed to parse uint in " << number;
	return -1;		return -1;
	}		}