diff options
| author | Janis Danisevskis <jdanis@google.com> | 2017-04-26 14:19:51 -0700 |
|---|---|---|
| committer | Jae Shin <jaeshin@google.com> | 2017-10-12 17:02:57 +0900 |
| commit | 62f58caebff53c1681a37c16466086bafd5558bc (patch) | |
| tree | d4c3b8fb3b8cdfc6dbf176c08b0ea4fff746739a | |
| parent | 3421c4a6499322c1e2908eee35ef3ec89c341f2e (diff) | |
| download | security-62f58caebff53c1681a37c16466086bafd5558bc.tar.gz | |
Split libkeymaster1 into libkeymaster and libkeymaster_portable
Also removed unused include
Bug: 37467707
Test: trivial
Merged-In: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
Change-Id: Ie029462cb79d7aec28a37aac22f04ce73ebac8da
(cherry picked from commit 5cc0d5ee603e436643c4f23fab91a0514c2d462d)
| -rw-r--r-- | keystore/Android.mk | 3 | ||||
| -rw-r--r-- | keystore/keystore_utils.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystore/Android.mk b/keystore/Android.mk index f87675dd..e854772c 100644 --- a/keystore/Android.mk +++ b/keystore/Android.mk @@ -57,7 +57,8 @@ LOCAL_SHARED_LIBRARIES := \ libselinux \ libsoftkeymasterdevice \ libkeymaster_messages \ - libkeymaster1 \ + libkeymaster_portable \ + libkeymaster \ libhwbinder \ libhidlbase \ libhidltransport \ diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp index 0d3f0ec8..b1777d0e 100644 --- a/keystore/keystore_utils.cpp +++ b/keystore/keystore_utils.cpp @@ -25,7 +25,6 @@ #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> |