diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/004-JniTest/jni_test.cc | 3 | ||||
| -rw-r--r-- | test/044-proxy/native_proxy.cc | 2 | ||||
| -rw-r--r-- | test/137-cfi/cfi.cc | 4 | ||||
| -rw-r--r-- | test/642-fp-callees/fp_callees.cc | 3 | ||||
| -rw-r--r-- | test/900-hello-plugin/load_unload.cc | 5 | ||||
| -rw-r--r-- | test/936-search-onload/search_onload.cc | 5 | ||||
| -rw-r--r-- | test/983-source-transform-verify/source_transform.cc | 1 | ||||
| -rw-r--r-- | test/common/runtime_state.cc | 4 | ||||
| -rw-r--r-- | test/common/stack_inspect.cc | 4 | ||||
| -rw-r--r-- | test/ti-agent/common_load.cc | 3 |
10 files changed, 21 insertions, 13 deletions
diff --git a/test/004-JniTest/jni_test.cc b/test/004-JniTest/jni_test.cc index bc5a0a64e8..eb14d48a8d 100644 --- a/test/004-JniTest/jni_test.cc +++ b/test/004-JniTest/jni_test.cc @@ -20,8 +20,9 @@ #include <iostream> #include <vector> +#include <android-base/logging.h> + #include "art_method-inl.h" -#include "base/logging.h" #include "jni.h" namespace art { diff --git a/test/044-proxy/native_proxy.cc b/test/044-proxy/native_proxy.cc index f168719bf5..f3178f9c2a 100644 --- a/test/044-proxy/native_proxy.cc +++ b/test/044-proxy/native_proxy.cc @@ -16,7 +16,7 @@ #include "jni.h" -#include "base/logging.h" +#include <android-base/logging.h> namespace art { diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc index 66270fd5c7..ef758e86e1 100644 --- a/test/137-cfi/cfi.cc +++ b/test/137-cfi/cfi.cc @@ -25,11 +25,11 @@ #include "jni.h" +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include <backtrace/Backtrace.h> -#include "android-base/stringprintf.h" #include "base/file_utils.h" -#include "base/logging.h" #include "base/macros.h" #include "gc/heap.h" #include "gc/space/image_space.h" diff --git a/test/642-fp-callees/fp_callees.cc b/test/642-fp-callees/fp_callees.cc index 600f9690eb..17bb55b70d 100644 --- a/test/642-fp-callees/fp_callees.cc +++ b/test/642-fp-callees/fp_callees.cc @@ -14,8 +14,9 @@ * limitations under the License. */ +#include <android-base/logging.h> + #include "base/casts.h" -#include "base/logging.h" #include "jni.h" namespace art { diff --git a/test/900-hello-plugin/load_unload.cc b/test/900-hello-plugin/load_unload.cc index 19312b4d71..cab0abf58b 100644 --- a/test/900-hello-plugin/load_unload.cc +++ b/test/900-hello-plugin/load_unload.cc @@ -17,9 +17,10 @@ #include <jni.h> #include <stdio.h> +#include <android-base/logging.h> +#include <android-base/macros.h> + #include "art_method-inl.h" -#include "base/logging.h" -#include "base/macros.h" #include "java_vm_ext.h" #include "runtime.h" diff --git a/test/936-search-onload/search_onload.cc b/test/936-search-onload/search_onload.cc index 90d87e0e7b..23cea83be6 100644 --- a/test/936-search-onload/search_onload.cc +++ b/test/936-search-onload/search_onload.cc @@ -18,8 +18,9 @@ #include <inttypes.h> -#include "android-base/stringprintf.h" -#include "base/logging.h" +#include <android-base/macros.h> +#include <android-base/stringprintf.h> + #include "base/macros.h" #include "jni.h" #include "jvmti.h" diff --git a/test/983-source-transform-verify/source_transform.cc b/test/983-source-transform-verify/source_transform.cc index ca3f88b347..3010d7a1a4 100644 --- a/test/983-source-transform-verify/source_transform.cc +++ b/test/983-source-transform-verify/source_transform.cc @@ -25,7 +25,6 @@ #include "jni.h" #include "jvmti.h" -#include "base/logging.h" #include "base/macros.h" #include "bytecode_utils.h" #include "dex_file.h" diff --git a/test/common/runtime_state.cc b/test/common/runtime_state.cc index 34580800cc..1eed80ec91 100644 --- a/test/common/runtime_state.cc +++ b/test/common/runtime_state.cc @@ -16,9 +16,11 @@ #include "jni.h" +#include <android-base/logging.h> +#include <android-base/macros.h> + #include "art_method-inl.h" #include "base/enums.h" -#include "base/logging.h" #include "dex_file-inl.h" #include "instrumentation.h" #include "jit/jit.h" diff --git a/test/common/stack_inspect.cc b/test/common/stack_inspect.cc index 80a278012d..046b1fbcdd 100644 --- a/test/common/stack_inspect.cc +++ b/test/common/stack_inspect.cc @@ -16,7 +16,9 @@ #include "jni.h" -#include "base/logging.h" +#include <android-base/logging.h> + +#include "base/mutex.h" #include "dex_file-inl.h" #include "jni_internal.h" #include "mirror/class-inl.h" diff --git a/test/ti-agent/common_load.cc b/test/ti-agent/common_load.cc index d85f33a05d..9a7352e479 100644 --- a/test/ti-agent/common_load.cc +++ b/test/ti-agent/common_load.cc @@ -17,7 +17,8 @@ #include <jni.h> #include <stdio.h> -#include "base/logging.h" +#include <android-base/logging.h> + #include "base/macros.h" #include "jni_binder.h" |