summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-09 06:39:20 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-09 06:39:20 +0100
commitb50fa1fc237f05ddc8b2e726e146b0bd2f208ef6 (patch)
tree505522c76273f6d6747d4fb63b92f70cc54b69ca
parentMerge "Make make_parent() to take const argument" (diff)
parentMerge "otautil: Clean up obsolete includes." (diff)
downloadandroid_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar.gz
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar.bz2
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar.lz
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar.xz
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.tar.zst
android_bootable_recovery-b50fa1fc237f05ddc8b2e726e146b0bd2f208ef6.zip
-rw-r--r--otautil/Android.mk6
-rw-r--r--otautil/SysUtil.cpp7
2 files changed, 1 insertions, 12 deletions
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 <assert.h>
#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <unistd.h>
#include <algorithm>
#include <string>