commit 0dbcba84e9e1f1d7453b8de6b0949e1f1179066e
author Steven Moreland <smoreland@google.com> Wed Jul 19 16:47:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 19 16:47:51 2017 +0000
tree 041c41ce314d8b2b5d34c4d05550cd5edb214373
parent 1b6df72815e7dc1c0d9614078faf045d5ab664c3
parent aa2bd8d0d94ad7e740de00db81033968b8bd8fd0

Revert "system/gatekeeper: use proper nativehelper headers" am: da7470b6d2 am: 0cbbed65b2 am: 9e2893e34f
am: aa2bd8d0d9

Change-Id: Ifbd80136a8a4664174482ed267b8d055d3cebdb1

gatekeeper.cpp

diff --git a/gatekeeper.cpp b/gatekeeper.cpp
index f9024d3..cfd878f 100644
--- a/gatekeeper.cpp
+++ b/gatekeeper.cpp
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <UniquePtr.h>
 #include <gatekeeper/gatekeeper.h>
-#include <nativehelper/UniquePtr.h>
 
 #include <endian.h>
 

include/gatekeeper/gatekeeper.h

diff --git a/include/gatekeeper/gatekeeper.h b/include/gatekeeper/gatekeeper.h
index 4615b82..7e1421f 100644
--- a/include/gatekeeper/gatekeeper.h
+++ b/include/gatekeeper/gatekeeper.h
@@ -18,8 +18,8 @@
 #define GATEKEEPER_H_
 
 #include <stdint.h>
+#include <UniquePtr.h>
 #include <hardware/hw_auth_token.h>
-#include <nativehelper/UniquePtr.h>
 
 #include "gatekeeper_messages.h"
 #include "password_handle.h"

include/gatekeeper/gatekeeper_messages.h

diff --git a/include/gatekeeper/gatekeeper_messages.h b/include/gatekeeper/gatekeeper_messages.h
index 305567c..1ec1e18 100644
--- a/include/gatekeeper/gatekeeper_messages.h
+++ b/include/gatekeeper/gatekeeper_messages.h
@@ -17,7 +17,7 @@
 #define GATEKEEPER_MESSAGES_H_
 
 #include <stdint.h>
-#include <nativehelper/UniquePtr.h>
+#include <UniquePtr.h>
 
 
 #include "gatekeeper_utils.h"