diff options
Diffstat (limited to 'trusty/keymaster/trusty_keymaster_device.cpp')
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_device.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp index 069b4fedb..de5e46335 100644 --- a/trusty/keymaster/trusty_keymaster_device.cpp +++ b/trusty/keymaster/trusty_keymaster_device.cpp @@ -14,26 +14,24 @@ * limitations under the License. */ -#include "trusty_keymaster_device.h" +#define LOG_TAG "TrustyKeymaster" #include <assert.h> +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> -#include <stddef.h> #include <type_traits> -#include <openssl/evp.h> -#include <openssl/x509.h> - -#define LOG_TAG "TrustyKeymaster" -#include <cutils/log.h> +#include <android/log.h> #include <hardware/keymaster0.h> - #include <keymaster/authorization_set.h> +#include "trusty_keymaster_device.h" #include "trusty_keymaster_ipc.h" #include "keymaster_ipc.h" |