Merge "system/core: use proper nativehelper headers"

am: 4f59afe9fa Change-Id: I0fee29c0ad6e81b83cd0f3f774cd08f483a5df6c
2017-07-19 15:31:07 +00:00 · 2017-07-19 15:31:07 +00:00 · 6208cd1322
commit 6208cd1322
parent 7564622f88 4f59afe9fa
5 changed files with 5 additions and 5 deletions
--- a/gatekeeperd/SoftGateKeeper.h
+++ b/gatekeeperd/SoftGateKeeper.h
@ -26,8 +26,8 @@ extern "C" {
 }

 #include <android-base/memory.h>
-#include <UniquePtr.h>
 #include <gatekeeper/gatekeeper.h>
+#include <nativehelper/UniquePtr.h>

 #include <iostream>
 #include <unordered_map>
--- a/gatekeeperd/SoftGateKeeperDevice.h
+++ b/gatekeeperd/SoftGateKeeperDevice.h
@ -19,7 +19,7 @@

 #include "SoftGateKeeper.h"

-#include <UniquePtr.h>
+#include <nativehelper/UniquePtr.h>

 using namespace gatekeeper;

--- a/gatekeeperd/tests/gatekeeper_test.cpp
+++ b/gatekeeperd/tests/gatekeeper_test.cpp
@ -19,7 +19,7 @@

 #include <gtest/gtest.h>
 #include <hardware/hw_auth_token.h>
-#include <UniquePtr.h>
+#include <nativehelper/UniquePtr.h>

 #include "../SoftGateKeeper.h"

--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@ -15,7 +15,7 @@
 */

 #include "nativeloader/native_loader.h"
-#include "ScopedUtfChars.h"
+#include <nativehelper/ScopedUtfChars.h>

 #include <dlfcn.h>
 #ifdef __ANDROID__
--- a/trusty/keymaster/trusty_keymaster_device_test.cpp
+++ b/trusty/keymaster/trusty_keymaster_device_test.cpp
@ -16,8 +16,8 @@
 #include <algorithm>
 #include <fstream>

-#include <UniquePtr.h>
 #include <gtest/gtest.h>
+#include <nativehelper/UniquePtr.h>
 #include <openssl/engine.h>

 #include <hardware/keymaster0.h>