summaryrefslogtreecommitdiffstats
path: root/libutils/tests
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-09-28 10:07:20 -0700
committerMark Salyzyn <salyzyn@google.com>2016-09-30 12:47:05 -0700
commit66ce3e08c5632a20ea66bde6dd76397041edf034 (patch)
treee77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /libutils/tests
parent0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff)
downloadsystem_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.gz
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.bz2
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.zip
system/core Replace cutils/log.h with android/log.h
Should use android/log.h instead of cutils/log.h as a good example to all others. Adjust header order to comply with Android Coding standards. Test: Compile Bug: 26552300 Bug: 31289077 Change-Id: I2c9cbbbd64d8dccf2d44356361d9742e4a9b9031
Diffstat (limited to 'libutils/tests')
-rw-r--r--libutils/tests/BitSet_test.cpp7
-rw-r--r--libutils/tests/LruCache_test.cpp5
-rw-r--r--libutils/tests/Vector_test.cpp7
3 files changed, 11 insertions, 8 deletions
diff --git a/libutils/tests/BitSet_test.cpp b/libutils/tests/BitSet_test.cpp
index 59d913e6b..fbcf02595 100644
--- a/libutils/tests/BitSet_test.cpp
+++ b/libutils/tests/BitSet_test.cpp
@@ -16,11 +16,12 @@
#define LOG_TAG "BitSet_test"
-#include <utils/BitSet.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
#include <unistd.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+#include <utils/BitSet.h>
+
namespace android {
class BitSet32Test : public testing::Test {
diff --git a/libutils/tests/LruCache_test.cpp b/libutils/tests/LruCache_test.cpp
index de440fd7e..4e885bba4 100644
--- a/libutils/tests/LruCache_test.cpp
+++ b/libutils/tests/LruCache_test.cpp
@@ -15,10 +15,11 @@
*/
#include <stdlib.h>
+
+#include <android/log.h>
+#include <gtest/gtest.h>
#include <utils/JenkinsHash.h>
#include <utils/LruCache.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
namespace {
diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp
index 24ecf86a0..671200f4f 100644
--- a/libutils/tests/Vector_test.cpp
+++ b/libutils/tests/Vector_test.cpp
@@ -18,11 +18,12 @@
#define __STDC_LIMIT_MACROS
#include <stdint.h>
-#include <utils/Vector.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
#include <unistd.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+#include <utils/Vector.h>
+
namespace android {
class VectorTest : public testing::Test {