diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-09-28 10:07:20 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 12:47:05 -0700 |
| commit | 66ce3e08c5632a20ea66bde6dd76397041edf034 (patch) | |
| tree | e77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /libnativebridge | |
| parent | 0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff) | |
| download | system_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 'libnativebridge')
4 files changed, 22 insertions, 15 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index ecfd719bc..9f9c83faf 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -16,8 +16,6 @@ #include "nativebridge/native_bridge.h" -#include <cstring> -#include <cutils/log.h> #include <dlfcn.h> #include <errno.h> #include <fcntl.h> @@ -25,6 +23,9 @@ #include <sys/mount.h> #include <sys/stat.h> +#include <cstring> + +#include <android/log.h> namespace android { diff --git a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp b/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp index 69c30a195..5a2b0a150 100644 --- a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp @@ -16,9 +16,6 @@ #include "NativeBridgeTest.h" -#include <cstdio> -#include <cstring> -#include <cutils/log.h> #include <dlfcn.h> #include <errno.h> #include <fcntl.h> @@ -26,6 +23,11 @@ #include <sys/mount.h> #include <sys/stat.h> +#include <cstdio> +#include <cstring> + +#include <android/log.h> + namespace android { TEST_F(NativeBridgeTest, PreInitializeNativeBridgeFail1) { diff --git a/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp b/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp index 74e96e041..af976b174 100644 --- a/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include "NativeBridgeTest.h" - -#include <cstdio> -#include <cstring> -#include <cutils/log.h> #include <dlfcn.h> #include <errno.h> #include <fcntl.h> @@ -26,6 +21,13 @@ #include <sys/mount.h> #include <sys/stat.h> +#include <cstdio> +#include <cstring> + +#include <android/log.h> + +#include "NativeBridgeTest.h" + namespace android { TEST_F(NativeBridgeTest, PreInitializeNativeBridgeFail2) { diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp index d3bbebefd..f3e5f38cf 100644 --- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp +++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp @@ -14,11 +14,6 @@ * limitations under the License. */ -#include "NativeBridgeTest.h" - -#include <cstdio> -#include <cstring> -#include <cutils/log.h> #include <dlfcn.h> #include <errno.h> #include <fcntl.h> @@ -26,6 +21,13 @@ #include <sys/mount.h> #include <sys/stat.h> +#include <cstdio> +#include <cstring> + +#include <android/log.h> + +#include "NativeBridgeTest.h" + namespace android { static constexpr const char* kTestData = "PreInitializeNativeBridge test."; |