commit a0e9742796462879000dc770d43c9fb17c377680
author Tao Bao <tbao@google.com> Thu Oct 12 03:22:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 12 03:22:17 2017 +0000
tree 5da2805e96798a4924a21e8930a56da65168df0c
parent 3c4e27012340395e9bd04d675f83d53246a00a88
parent 99f0d9e52bdbe314d77300f883d66e4470d4a5ee

Merge "Drop -Wno-unused-parameter."

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index c9ce34b..8fac2ff 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -120,10 +120,10 @@
     libedify \
     libotafault \
     libotautil \
-    libbspatch \
-    libbz
+    libbspatch
 LOCAL_SHARED_LIBRARIES := \
     libbase \
+    libbz \
     libcrypto \
     liblog \
     libz \

minui/events.cpp

diff --git a/minui/events.cpp b/minui/events.cpp
index 24c2a82..2894c3b 100644
--- a/minui/events.cpp
+++ b/minui/events.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <stdio.h>

otafault/ota_io.cpp

diff --git a/otafault/ota_io.cpp b/otafault/ota_io.cpp
index 1308973..63ef18e 100644
--- a/otafault/ota_io.cpp
+++ b/otafault/ota_io.cpp
@@ -26,6 +26,7 @@
 
 #include <map>
 #include <mutex>
+#include <string>
 
 #include <android-base/thread_annotations.h>
 

otautil/SysUtil.cpp

diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index 0655c47..48336ad 100644
--- a/otautil/SysUtil.cpp
+++ b/otautil/SysUtil.cpp
@@ -16,6 +16,7 @@
 
 #include "otautil/SysUtil.h"
 
+#include <errno.h>  // TEMP_FAILURE_RETRY
 #include <fcntl.h>
 #include <stdint.h>  // SIZE_MAX
 #include <sys/mman.h>