diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 10:09:12 +0200 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 10:09:12 +0200 |
| commit | 272eedf93d683c3065e621c85ecb809572c0eea4 (patch) | |
| tree | 7dced004f2b82d467609891e2bbdccd5476fd92e /updater | |
| parent | Snap for 4388640 from 6d5da419715a852e29dde9f25858dc3802819dea to pi-release (diff) | |
| parent | Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a am: bb971cce89 (diff) | |
| download | android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.gz android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.bz2 android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.lz android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.xz android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.tar.zst android_bootable_recovery-272eedf93d683c3065e621c85ecb809572c0eea4.zip | |
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/Android.mk | 2 | ||||
| -rw-r--r-- | updater/blockimg.cpp | 4 | ||||
| -rw-r--r-- | updater/install.cpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index 12181602f..6f334ee18 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -67,7 +67,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -Wall \ - -Wno-unused-parameter \ -Werror LOCAL_EXPORT_C_INCLUDE_DIRS := \ @@ -93,7 +92,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -Wall \ - -Wno-unused-parameter \ -Werror LOCAL_STATIC_LIBRARIES := \ diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 0f8364441..ce3cea4f3 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -52,8 +52,8 @@ #include "edify/expr.h" #include "otafault/ota_io.h" #include "otautil/error_code.h" -#include "print_sha1.h" -#include "rangeset.h" +#include "otautil/print_sha1.h" +#include "otautil/rangeset.h" #include "updater/install.h" #include "updater/updater.h" diff --git a/updater/install.cpp b/updater/install.cpp index 01210f51c..9425d1872 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -54,6 +54,7 @@ #include <openssl/sha.h> #include <selinux/label.h> #include <selinux/selinux.h> +#include <tune2fs.h> #include <ziparchive/zip_archive.h> #include "edify/expr.h" @@ -61,8 +62,7 @@ #include "otafault/ota_io.h" #include "otautil/DirUtil.h" #include "otautil/error_code.h" -#include "print_sha1.h" -#include "tune2fs.h" +#include "otautil/print_sha1.h" #include "updater/updater.h" // Send over the buffer to recovery though the command pipe. |