Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106c3556 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "system/core: use proper nativehelper headers" am: 4f59afe9 

am: 6208cd13

Change-Id: I74083b7169f03bbe347c8802c13cb6c9c7fad440
parents 5cf308bc 6208cd13

gatekeeperd/SoftGateKeeper.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

gatekeeperd/SoftGateKeeperDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include "SoftGateKeeper.h"



#include <UniquePtr.h>

#include <nativehelper/UniquePtr.h>



using namespace gatekeeper;

gatekeeperd/tests/gatekeeper_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#include <gtest/gtest.h>

#include <hardware/hw_auth_token.h>

#include <UniquePtr.h>

#include <nativehelper/UniquePtr.h>



#include "../SoftGateKeeper.h"

libnativeloader/native_loader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include "nativeloader/native_loader.h"

#include "ScopedUtfChars.h"

#include <nativehelper/ScopedUtfChars.h>



#include <dlfcn.h>

#ifdef __ANDROID__

trusty/keymaster/trusty_keymaster_device_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>