diff options
| author | Tao Bao <tbao@google.com> | 2016-11-09 06:45:50 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 06:45:50 +0100 |
| commit | d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72 (patch) | |
| tree | 273ea1678feeac7ef28c8ade6b96cb62479cbb0e | |
| parent | Merge "Make make_parent() to take const argument" am: 52e2a97aa7 (diff) | |
| parent | Merge "otautil: Clean up obsolete includes." (diff) | |
| download | android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar.gz android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar.bz2 android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar.lz android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar.xz android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.tar.zst android_bootable_recovery-d9d435cd8315e6992ec7d2b87d0a2e88c0c01f72.zip | |
| -rw-r--r-- | otautil/Android.mk | 6 | ||||
| -rw-r--r-- | otautil/SysUtil.cpp | 7 |
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> |