From 14b61e7b961bb49787ec9ec8f8f7a95c8d12b71c Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 8 Nov 2016 13:24:27 -0800 Subject: otautil: Clean up obsolete includes. external/zlib and external/safe-iop/include were used by Zip.c, which became obsolete after [1]. Removing - : we no longer call assert(3); - : we no longer use PATH_MAX; - : we don't need FILE anymore; - : no more malloc(3)/calloc(3); - : was once needed for lseek(2); - : no more memset(3). Adding - for SIZE_MAX. [1] commit 8cf5c8f60f51049278b08ae4cbc31df397b651fd: "Replace minzip with libziparchive". Test: `mmma bootable/recovery` Change-Id: I349e909ba83d0f6ade5f92856ce3934f29fdca6c --- otautil/Android.mk | 6 ------ otautil/SysUtil.cpp | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'otautil') diff --git a/otautil/Android.mk b/otautil/Android.mk index 3acfa533e..e602f19ee 100644 --- a/otautil/Android.mk +++ b/otautil/Android.mk @@ -20,16 +20,10 @@ LOCAL_SRC_FILES := \ DirUtil.cpp \ ZipUtil.cpp -LOCAL_C_INCLUDES := \ - external/zlib \ - external/safe-iop/include - LOCAL_STATIC_LIBRARIES := libselinux libbase LOCAL_MODULE := libotautil -LOCAL_CLANG := true - LOCAL_CFLAGS += -Werror -Wall include $(BUILD_STATIC_LIBRARY) diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp index a8d5f4ad3..a2133b953 100644 --- a/otautil/SysUtil.cpp +++ b/otautil/SysUtil.cpp @@ -16,17 +16,12 @@ #include "SysUtil.h" -#include #include #include -#include -#include -#include -#include +#include #include #include #include -#include #include #include -- cgit v1.2.3