summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorSteven Moreland2017-07-19 10:36:37 -0500
committerandroid-build-merger2017-07-19 10:36:37 -0500
commit57db1511bdc8f1317997edc1850650f60055ad0c (patch)
treeec8db333075177a05410f9720ca85eb7666c798c /trusty
parenteab1c14aba8e7d8fa1f6bcbaab9ed4c718ad62a2 (diff)
parent106c35568815f58d35ce6db7fbe30675f8d31c5b (diff)
downloadplatform-system-core-57db1511bdc8f1317997edc1850650f60055ad0c.tar.gz
platform-system-core-57db1511bdc8f1317997edc1850650f60055ad0c.tar.xz
platform-system-core-57db1511bdc8f1317997edc1850650f60055ad0c.zip
Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208cd1322
am: 106c355688 Change-Id: I8ddfceec58ab69b6c0952ea39f3ad78802f5d7bc
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/trusty_keymaster_device_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/trusty/keymaster/trusty_keymaster_device_test.cpp b/trusty/keymaster/trusty_keymaster_device_test.cpp
index 3bb543015..e8f5c0b69 100644
--- a/trusty/keymaster/trusty_keymaster_device_test.cpp
+++ b/trusty/keymaster/trusty_keymaster_device_test.cpp
@@ -16,8 +16,8 @@
16#include <algorithm> 16#include <algorithm>
17#include <fstream> 17#include <fstream>
18 18
19#include <UniquePtr.h>
20#include <gtest/gtest.h> 19#include <gtest/gtest.h>
20#include <nativehelper/UniquePtr.h>
21#include <openssl/engine.h> 21#include <openssl/engine.h>
22 22
23#include <hardware/keymaster0.h> 23#include <hardware/keymaster0.h>