commit 4917a8cf62b6b09c9d0b2b48688c33c76f96cece
author Tao Bao <tbao@google.com> Wed Nov 09 05:51:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 09 05:51:21 2016 +0000
tree 273ea1678feeac7ef28c8ade6b96cb62479cbb0e
parent cd3513c8dd3fdda08faa0f3935767cad45c796ec
parent d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72

Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23
am: d9d435cd83

Change-Id: I5b1882758ae438cc6dd6a4926d20a04ece594032

otautil/Android.mk

diff --git a/otautil/Android.mk b/otautil/Android.mk
index 3acfa53..e602f19 100644
--- a/otautil/Android.mk
+++ b/otautil/Android.mk
@@ -20,16 +20,10 @@
     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)

otautil/SysUtil.cpp

diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index a8d5f4a..a2133b9 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>