diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-09 17:44:59 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2013-09-10 20:47:43 -0700 |
commit | 87eac99a21772ae56018cb81db6966557b459554 (patch) | |
tree | f41cab7353b4ffd8c757bc67a95e34091ca7f971 | |
parent | bdd61696c6720faa14ca9fdf180e519138b3d087 (diff) | |
download | frameworks_base-87eac99a21772ae56018cb81db6966557b459554.zip frameworks_base-87eac99a21772ae56018cb81db6966557b459554.tar.gz frameworks_base-87eac99a21772ae56018cb81db6966557b459554.tar.bz2 |
Remove dependency on JNIHelp header side effects.
Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
26 files changed, 72 insertions, 0 deletions
diff --git a/core/jni/android_database_SQLiteConnection.cpp b/core/jni/android_database_SQLiteConnection.cpp index f70f0d1..6e496fd 100644 --- a/core/jni/android_database_SQLiteConnection.cpp +++ b/core/jni/android_database_SQLiteConnection.cpp @@ -19,6 +19,7 @@ #include <jni.h> #include <JNIHelp.h> #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Log.h> #include <utils/String8.h> diff --git a/core/jni/android_media_RemoteDisplay.cpp b/core/jni/android_media_RemoteDisplay.cpp index 3fd8ed9..463be5e 100644 --- a/core/jni/android_media_RemoteDisplay.cpp +++ b/core/jni/android_media_RemoteDisplay.cpp @@ -24,6 +24,7 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> +#include <android_runtime/Log.h> #include <binder/IServiceManager.h> diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index dd07c4f..1779c9f 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -21,6 +21,7 @@ #include "utils/misc.h" #include "cutils/debugger.h" +#include <cutils/log.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index 17a0677..c83541d 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -19,6 +19,7 @@ #include "JNIHelp.h" #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Log.h> #include <input/Input.h> #include "android_view_KeyEvent.h" diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index ad6c0f2..f1b90e1 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -20,6 +20,7 @@ #include <SkMatrix.h> #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Log.h> #include <input/Input.h> #include "android_os_Parcel.h" diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp index 8b6dc60..5e29213 100644 --- a/core/jni/android_view_PointerIcon.cpp +++ b/core/jni/android_view_PointerIcon.cpp @@ -21,6 +21,7 @@ #include "android_view_PointerIcon.h" #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Log.h> #include <android/graphics/GraphicsJNI.h> diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 3f54fd7..1868469 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -26,6 +26,7 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> +#include <android_runtime/Log.h> #include <binder/Parcel.h> diff --git a/include/android_runtime/Log.h b/include/android_runtime/Log.h new file mode 100644 index 0000000..aa6d202 --- /dev/null +++ b/include/android_runtime/Log.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _RUNTIME_ANDROID_LOG_H +#define _RUNTIME_ANDROID_LOG_H + +// This relies on JNIHelp.h + +/* Logging macros. + * + * Logs an exception. If the exception is omitted or NULL, logs the current exception + * from the JNI environment, if any. + */ +#define LOG_EX(env, priority, tag, ...) \ + jniLogException(env, ANDROID_##priority, tag, ##__VA_ARGS__) +#define LOGV_EX(env, ...) LOG_EX(env, LOG_VERBOSE, LOG_TAG, ##__VA_ARGS__) +#define LOGD_EX(env, ...) LOG_EX(env, LOG_DEBUG, LOG_TAG, ##__VA_ARGS__) +#define LOGI_EX(env, ...) LOG_EX(env, LOG_INFO, LOG_TAG, ##__VA_ARGS__) +#define LOGW_EX(env, ...) LOG_EX(env, LOG_WARN, LOG_TAG, ##__VA_ARGS__) +#define LOGE_EX(env, ...) LOG_EX(env, LOG_ERROR, LOG_TAG, ##__VA_ARGS__) + +#endif // _RUNTIME_ANDROID_LOG_H diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 666d111..bbb74d2 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -21,6 +21,7 @@ #include "android_media_MediaDrm.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "android_os_Parcel.h" #include "jni.h" #include "JNIHelp.h" diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index 1704d5c..1ac45d4 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -22,6 +22,7 @@ #include "android_media_Utils.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "jni.h" #include "JNIHelp.h" diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 9b66c06..d134667 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -31,6 +31,7 @@ #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" +#include "android_runtime/Log.h" #include "utils/Errors.h" // for status_t #include "utils/KeyedVector.h" #include "utils/String8.h" diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 5d27966..4e3d14e 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -25,6 +25,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" using namespace android; diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index fbd5d21..77c7966 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -26,6 +26,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "MtpDatabase.h" #include "MtpDataPacket.h" diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index 113784e..b61b66c 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -28,6 +28,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "private/android_filesystem_config.h" #include "MtpTypes.h" diff --git a/media/jni/mediaeditor/VideoEditorClasses.cpp b/media/jni/mediaeditor/VideoEditorClasses.cpp index 4982a47..d8099dd 100644 --- a/media/jni/mediaeditor/VideoEditorClasses.cpp +++ b/media/jni/mediaeditor/VideoEditorClasses.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#define LOG_TAG "VideoEditorClasses" #include <VideoEditorClasses.h> #include <VideoEditorJava.h> diff --git a/media/jni/mediaeditor/VideoEditorJava.cpp b/media/jni/mediaeditor/VideoEditorJava.cpp index bcf9099..fde0fb5 100644 --- a/media/jni/mediaeditor/VideoEditorJava.cpp +++ b/media/jni/mediaeditor/VideoEditorJava.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#define LOG_TAG "VideoEditorJava" + #include <VideoEditorClasses.h> #include <VideoEditorJava.h> #include <VideoEditorLogging.h> diff --git a/media/jni/mediaeditor/VideoEditorLogging.h b/media/jni/mediaeditor/VideoEditorLogging.h index 479d8b6..1f1228a 100644 --- a/media/jni/mediaeditor/VideoEditorLogging.h +++ b/media/jni/mediaeditor/VideoEditorLogging.h @@ -17,6 +17,16 @@ #ifndef VIDEO_EDITOR_LOGGING_H #define VIDEO_EDITOR_LOGGING_H +#ifndef LOG_TAG +#error "No LOG_TAG defined!" +#endif + +/* + * This file is used as a proxy for cutils/log.h. Include cutils/log.h here to + * avoid relying on import ordering. + */ +#include <cutils/log.h> + //#define VIDEOEDIT_LOGGING_ENABLED #define VIDEOEDIT_LOG_INDENTATION (3) diff --git a/media/jni/mediaeditor/VideoEditorOsal.cpp b/media/jni/mediaeditor/VideoEditorOsal.cpp index a8c08ac..c12b1f5 100644 --- a/media/jni/mediaeditor/VideoEditorOsal.cpp +++ b/media/jni/mediaeditor/VideoEditorOsal.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#define LOG_TAG "VideoEditorOsal" + #include <VideoEditorJava.h> #include <VideoEditorLogging.h> #include <VideoEditorOsal.h> diff --git a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp index c8fb263..2f8e357 100644 --- a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp +++ b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#define LOG_TAG "VideoEditorPropertiesMain" + #include <dlfcn.h> #include <stdio.h> #include <unistd.h> diff --git a/services/jni/com_android_server_AssetAtlasService.cpp b/services/jni/com_android_server_AssetAtlasService.cpp index 62e950f..885d21e 100644 --- a/services/jni/com_android_server_AssetAtlasService.cpp +++ b/services/jni/com_android_server_AssetAtlasService.cpp @@ -20,6 +20,7 @@ #include "JNIHelp.h" #include <android_view_GraphicBuffer.h> +#include <cutils/log.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> diff --git a/services/jni/com_android_server_UsbDeviceManager.cpp b/services/jni/com_android_server_UsbDeviceManager.cpp index 0014db5..3551733 100644 --- a/services/jni/com_android_server_UsbDeviceManager.cpp +++ b/services/jni/com_android_server_UsbDeviceManager.cpp @@ -20,6 +20,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include <stdio.h> #include <asm/byteorder.h> diff --git a/services/jni/com_android_server_UsbHostManager.cpp b/services/jni/com_android_server_UsbHostManager.cpp index d0a6cdf..639790b 100644 --- a/services/jni/com_android_server_UsbHostManager.cpp +++ b/services/jni/com_android_server_UsbHostManager.cpp @@ -20,6 +20,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "utils/Vector.h" #include <usbhost/usbhost.h> diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/jni/com_android_server_input_InputManagerService.cpp index 09e5be4..b6c2eb4 100644 --- a/services/jni/com_android_server_input_InputManagerService.cpp +++ b/services/jni/com_android_server_input_InputManagerService.cpp @@ -29,6 +29,7 @@ #include "jni.h" #include <limits.h> #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Log.h> #include <utils/Looper.h> diff --git a/services/jni/com_android_server_location_FlpHardwareProvider.cpp b/services/jni/com_android_server_location_FlpHardwareProvider.cpp index b403ee6..f5d7f8b 100644 --- a/services/jni/com_android_server_location_FlpHardwareProvider.cpp +++ b/services/jni/com_android_server_location_FlpHardwareProvider.cpp @@ -23,6 +23,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include "hardware/fused_location.h" #include "hardware_legacy/power.h" diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/jni/com_android_server_location_GpsLocationProvider.cpp index 98de12a..aec254b 100644 --- a/services/jni/com_android_server_location_GpsLocationProvider.cpp +++ b/services/jni/com_android_server_location_GpsLocationProvider.cpp @@ -26,6 +26,7 @@ #include "utils/Log.h" #include "utils/misc.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/Log.h" #include <string.h> #include <pthread.h> diff --git a/services/jni/com_android_server_power_PowerManagerService.cpp b/services/jni/com_android_server_power_PowerManagerService.cpp index 88b13b5..151e134 100644 --- a/services/jni/com_android_server_power_PowerManagerService.cpp +++ b/services/jni/com_android_server_power_PowerManagerService.cpp @@ -26,6 +26,7 @@ #include <limits.h> #include <android_runtime/AndroidRuntime.h> +#include <android_runtime/Log.h> #include <utils/Timers.h> #include <utils/misc.h> #include <utils/String8.h> |