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

Commit bdeef4b0 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Include correct authorization_set.h header" am: b99ace4a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1992925

Change-Id: I259e564d82ec1a8202faa771e6b3af01b0f2b87c
parents 6bf71e0c b99ace4a

trusty/keymaster/3.0/TrustyKeymaster3Device.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 


#define LOG_TAG "android.hardware.keymaster@3.0-impl.trusty"



#include <authorization_set.h>

#include <cutils/log.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/authorization_set.h>

#include <keymaster_tags.h>

#include <trusty_keymaster/TrustyKeymaster3Device.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>

trusty/keymaster/4.0/TrustyKeymaster4Device.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#define LOG_TAG "android.hardware.keymaster@4.0-impl.trusty"



#include <android/hardware/keymaster/3.0/IKeymasterDevice.h>

#include <authorization_set.h>

#include <cutils/log.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/authorization_set.h>

#include <keymaster_tags.h>

#include <trusty_keymaster/TrustyKeymaster4Device.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>