diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-31 20:06:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-31 20:06:13 -0800 |
| commit | 7b82103552db1f1ef7823319d78b66a041c60b73 (patch) | |
| tree | 9b5db6072bba4f9ca1e093c7ee1106734d641f04 | |
| parent | aa47f72421df9a88ecf0965d62696bee7be2b6d4 (diff) | |
| parent | 23e024aec04a642c1dbf7f022467c8d687f11f86 (diff) | |
| download | android_system_keymaster-7b82103552db1f1ef7823319d78b66a041c60b73.tar.gz android_system_keymaster-7b82103552db1f1ef7823319d78b66a041c60b73.tar.bz2 android_system_keymaster-7b82103552db1f1ef7823319d78b66a041c60b73.zip | |
Explicitly include log/log.h instead of cutils/log.h
am: 23e024aec0
Change-Id: I241d50b275052ffd1f0fc79148e887c38ae6ff99
| -rw-r--r-- | legacy_support/keymaster_passthrough_engine.cpp | 2 | ||||
| -rw-r--r-- | ng/AndroidKeymaster3Device.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/legacy_support/keymaster_passthrough_engine.cpp b/legacy_support/keymaster_passthrough_engine.cpp index 7aa8908..bd8f5b4 100644 --- a/legacy_support/keymaster_passthrough_engine.cpp +++ b/legacy_support/keymaster_passthrough_engine.cpp @@ -28,7 +28,7 @@ #include <type_traits> #define LOG_TAG "Keymaster2Engine" -#include <cutils/log.h> +#include <android/log.h> using std::shared_ptr; using std::unique_ptr; diff --git a/ng/AndroidKeymaster3Device.cpp b/ng/AndroidKeymaster3Device.cpp index 93ef72b..da00d96 100644 --- a/ng/AndroidKeymaster3Device.cpp +++ b/ng/AndroidKeymaster3Device.cpp @@ -19,7 +19,7 @@ #include "include/AndroidKeymaster3Device.h" -#include <cutils/log.h> +#include <android/log.h> #include "include/authorization_set.h" |