Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208cd1322

am: 106c355688 Change-Id: I8ddfceec58ab69b6c0952ea39f3ad78802f5d7bc
2017-07-19 15:36:37 +00:00 · 2017-07-19 15:36:37 +00:00 · 57db1511bd
commit 57db1511bd
parent eab1c14aba 106c355688
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>