Merge "Deprecate <cutils/log.h> and <utils/Log.h>"
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index 684f69c..fba2583 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -28,7 +28,7 @@
#include <string.h>
#include <unistd.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <openssl/bn.h>
#include <openssl/ec.h>
diff --git a/keystore/auth_token_table.cpp b/keystore/auth_token_table.cpp
index 063da70..63282e6 100644
--- a/keystore/auth_token_table.cpp
+++ b/keystore/auth_token_table.cpp
@@ -23,7 +23,7 @@
#include <algorithm>
-#include <cutils/log.h>
+#include <log/log.h>
namespace keystore {
diff --git a/keystore/blob.cpp b/keystore/blob.cpp
index 4fd7687..b901553 100644
--- a/keystore/blob.cpp
+++ b/keystore/blob.cpp
@@ -21,7 +21,7 @@
#include <fcntl.h>
#include <string.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include "blob.h"
#include "entropy.h"
diff --git a/keystore/entropy.cpp b/keystore/entropy.cpp
index 1bfe9a1..8d4d305 100644
--- a/keystore/entropy.cpp
+++ b/keystore/entropy.cpp
@@ -24,7 +24,7 @@
#include <string.h>
#include <unistd.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include "keystore_utils.h"
diff --git a/keystore/keymaster_enforcement.cpp b/keystore/keymaster_enforcement.cpp
index 5a6e591..1a7fa80 100644
--- a/keystore/keymaster_enforcement.cpp
+++ b/keystore/keymaster_enforcement.cpp
@@ -25,8 +25,9 @@
#include <openssl/evp.h>
-#include <cutils/log.h>
#include <hardware/hw_auth_token.h>
+#include <log/log.h>
+
#include <list>
#include <keystore/keystore_hidl_support.h>
diff --git a/keystore/keystore_attestation_id.cpp b/keystore/keystore_attestation_id.cpp
index 491efb7..b48639f 100644
--- a/keystore/keystore_attestation_id.cpp
+++ b/keystore/keystore_attestation_id.cpp
@@ -17,7 +17,7 @@
#define LOG_TAG "keystore_att_id"
-#include <cutils/log.h>
+#include <log/log.h>
#include <memory>
#include <string>
diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp
index e5ae29a..71e8ed2 100644
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -22,7 +22,7 @@
#include <string.h>
#include <unistd.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/keystore/legacy_keymaster_device_wrapper.cpp b/keystore/legacy_keymaster_device_wrapper.cpp
index 187252e..4d23bf0 100644
--- a/keystore/legacy_keymaster_device_wrapper.cpp
+++ b/keystore/legacy_keymaster_device_wrapper.cpp
@@ -19,7 +19,7 @@
#include "legacy_keymaster_device_wrapper.h"
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/keymaster2.h>
#include <hardware/keymaster_defs.h>
diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index 40be938..cd79539 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -18,8 +18,8 @@
#include "permissions.h"
-#include <cutils/log.h>
#include <cutils/sockets.h>
+#include <log/log.h>
#include <private/android_filesystem_config.h>
#include <selinux/android.h>
diff --git a/keystore/user_state.cpp b/keystore/user_state.cpp
index b70de4c..af3336b 100644
--- a/keystore/user_state.cpp
+++ b/keystore/user_state.cpp
@@ -26,7 +26,7 @@
#include <openssl/evp.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include "blob.h"
#include "keystore_utils.h"
