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

Commit b99ace4a authored by David Drysdale's avatar David Drysdale Committed by Gerrit Code Review
Browse files

Merge "Include correct authorization_set.h header"

parents a323e023 74f76396

trusty/keymaster/3.0/TrustyKeymaster3Device.cpp

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




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

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





#include <authorization_set.h>

#include <cutils/log.h>

#include <cutils/log.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/authorization_set.h>

#include <keymaster_tags.h>

#include <trusty_keymaster/TrustyKeymaster3Device.h>

#include <trusty_keymaster/TrustyKeymaster3Device.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>

trusty/keymaster/4.0/TrustyKeymaster4Device.cpp

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

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





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

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

#include <authorization_set.h>

#include <cutils/log.h>

#include <cutils/log.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/android_keymaster_messages.h>

#include <keymaster/authorization_set.h>

#include <keymaster_tags.h>

#include <trusty_keymaster/TrustyKeymaster4Device.h>

#include <trusty_keymaster/TrustyKeymaster4Device.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>

#include <trusty_keymaster/ipc/trusty_keymaster_ipc.h>