commit 56486790a88f28d796040f496d10b44a70a00e6c
author John Stultz <john.stultz@linaro.org> Mon Nov 13 19:33:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 13 19:33:52 2017 +0000
tree 99830dd6f2599ef009bd80645766a16789fa1c73
parent 257390cc487e067e3a773f31ab11155c898d3d4a
parent 10ba37832866a47dc5c7e57a9cfce063cce3e7f6

Merge "hikey: installer: Update UEFI binaries and ptable to new source base" am: 6cd2865887 am: 077e541d91
am: 10ba378328

Change-Id: I1cf28467002d583020dc97f2504302340190bcb0

gralloc/gralloc_module.cpp

diff --git a/gralloc/gralloc_module.cpp b/gralloc/gralloc_module.cpp
index 70d2c69..73e5c17 100644
--- a/gralloc/gralloc_module.cpp
+++ b/gralloc/gralloc_module.cpp
@@ -18,6 +18,7 @@
 
 #include <errno.h>
 #include <pthread.h>
+#include <string.h>
 
 #include <cutils/log.h>
 #include <cutils/atomic.h>

gralloc960/gralloc_module_ion.cpp

diff --git a/gralloc960/gralloc_module_ion.cpp b/gralloc960/gralloc_module_ion.cpp
index d91902c..db50d00 100644
--- a/gralloc960/gralloc_module_ion.cpp
+++ b/gralloc960/gralloc_module_ion.cpp
@@ -18,6 +18,7 @@
 
 #include <errno.h>
 #include <pthread.h>
+#include <string.h>
 
 #include <cutils/log.h>
 #include <cutils/atomic.h>

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 61da9eb..0c354d2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -47,7 +47,7 @@
     <hal format="hidl">
         <name>android.hardware.wifi.supplicant</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>ISupplicant</name>
             <instance>default</instance>