ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I259e564d82ec1a8202faa771e6b3af01b0f2b87c
This commit is contained in:
David Drysdale 2022-03-01 11:02:21 +00:00 • committed by Automerger Merge Worker
commit bdeef4b0ed
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trusty/keymaster/3.0/TrustyKeymaster3Device.cpp
View file

@ -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>

3
trusty/keymaster/4.0/TrustyKeymaster4Device.cpp
View file

@ -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>