tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable""

Browse source
This commit is contained in:
Nick Kralevich 2017-05-03 00:41:27 +00:00 committed by Android (Google) Code Review
commit 7069027bc7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keystore/Android.mk
View file

@ -57,8 +57,7 @@ LOCAL_SHARED_LIBRARIES := \
libselinux \
libsoftkeymasterdevice \
libkeymaster_messages \
libkeymaster_portable \
libkeymaster \
libkeymaster1 \
libhwbinder \
libhidlbase \
libhidltransport \

1
keystore/keystore_utils.cpp
View file

@ -25,6 +25,7 @@
#include <cutils/log.h>
#include <private/android_filesystem_config.h>
#include <keymaster/android_keymaster_utils.h>
#include <keystore/authorization_set.h>
#include <keystore/keystore_client.h>
#include <keystore/IKeystoreService.h>