Merge "system/core: use proper nativehelper headers"

This commit is contained in:
Treehugger Robot 2017-07-19 15:22:41 +00:00 committed by Gerrit Code Review
commit 4f59afe9fa
5 changed files with 5 additions and 5 deletions

View File

@ -26,8 +26,8 @@ extern "C" {
} }
#include <android-base/memory.h> #include <android-base/memory.h>
#include <UniquePtr.h>
#include <gatekeeper/gatekeeper.h> #include <gatekeeper/gatekeeper.h>
#include <nativehelper/UniquePtr.h>
#include <iostream> #include <iostream>
#include <unordered_map> #include <unordered_map>

View File

@ -19,7 +19,7 @@
#include "SoftGateKeeper.h" #include "SoftGateKeeper.h"
#include <UniquePtr.h> #include <nativehelper/UniquePtr.h>
using namespace gatekeeper; using namespace gatekeeper;

View File

@ -19,7 +19,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <hardware/hw_auth_token.h> #include <hardware/hw_auth_token.h>
#include <UniquePtr.h> #include <nativehelper/UniquePtr.h>
#include "../SoftGateKeeper.h" #include "../SoftGateKeeper.h"

View File

@ -15,7 +15,7 @@
*/ */
#include "nativeloader/native_loader.h" #include "nativeloader/native_loader.h"
#include "ScopedUtfChars.h" #include <nativehelper/ScopedUtfChars.h>
#include <dlfcn.h> #include <dlfcn.h>
#ifdef __ANDROID__ #ifdef __ANDROID__

View File

@ -16,8 +16,8 @@
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
#include <UniquePtr.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <nativehelper/UniquePtr.h>
#include <openssl/engine.h> #include <openssl/engine.h>
#include <hardware/keymaster0.h> #include <hardware/keymaster0.h>