diff options
author | Glenn Kasten <gkasten@google.com> | 2012-03-13 14:46:23 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-03-13 16:14:19 -0700 |
commit | c81d31c3f801ba3d559a22c27b926ace38a7ab49 (patch) | |
tree | c2de55ecf348f27e04329684d6b79543759a4365 | |
parent | 05f692e8050c3650ec123b2361143a121e2e7d4b (diff) | |
download | frameworks_base-c81d31c3f801ba3d559a22c27b926ace38a7ab49.zip frameworks_base-c81d31c3f801ba3d559a22c27b926ace38a7ab49.tar.gz frameworks_base-c81d31c3f801ba3d559a22c27b926ace38a7ab49.tar.bz2 |
Use correct syntax for #include <> ""
Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
-rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 12 | ||||
-rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 8 | ||||
-rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 12 | ||||
-rw-r--r-- | core/jni/android_media_JetPlayer.cpp | 10 | ||||
-rw-r--r-- | core/jni/android_media_ToneGenerator.cpp | 12 | ||||
-rw-r--r-- | include/media/JetPlayer.h | 2 | ||||
-rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 2 | ||||
-rwxr-xr-x | media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp | 5 | ||||
-rw-r--r-- | media/mediaserver/main_mediaserver.cpp | 10 |
9 files changed, 38 insertions, 35 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index b34dbce..7d52e10 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -23,13 +23,13 @@ #include <fcntl.h> #include <math.h> -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" +#include <jni.h> +#include <JNIHelp.h> +#include <android_runtime/AndroidRuntime.h> -#include "utils/Log.h" -#include "media/AudioRecord.h" -#include "media/mediarecorder.h" +#include <utils/Log.h> +#include <media/AudioRecord.h> +#include <media/mediarecorder.h> #include <cutils/bitops.h> diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index ee5eb7e..fe40c50 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -16,16 +16,16 @@ */ #define LOG_TAG "AudioSystem" -#include "utils/Log.h" +#include <utils/Log.h> #include <stdio.h> #include <unistd.h> #include <fcntl.h> #include <math.h> -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" +#include <jni.h> +#include <JNIHelp.h> +#include <android_runtime/AndroidRuntime.h> #include <media/AudioSystem.h> diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 57f5d3d..6c5f6313 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -22,13 +22,13 @@ #include <fcntl.h> #include <math.h> -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" +#include <jni.h> +#include <JNIHelp.h> +#include <android_runtime/AndroidRuntime.h> -#include "utils/Log.h" -#include "media/AudioSystem.h" -#include "media/AudioTrack.h" +#include <utils/Log.h> +#include <media/AudioSystem.h> +#include <media/AudioTrack.h> #include <binder/MemoryHeapBase.h> #include <binder/MemoryBase.h> diff --git a/core/jni/android_media_JetPlayer.cpp b/core/jni/android_media_JetPlayer.cpp index 9f9bedb..8a9c1382 100644 --- a/core/jni/android_media_JetPlayer.cpp +++ b/core/jni/android_media_JetPlayer.cpp @@ -22,12 +22,12 @@ #include <unistd.h> #include <fcntl.h> -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" +#include <jni.h> +#include <JNIHelp.h> +#include <android_runtime/AndroidRuntime.h> -#include "utils/Log.h" -#include "media/JetPlayer.h" +#include <utils/Log.h> +#include <media/JetPlayer.h> using namespace android; diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index 544b4c0..31151a6 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -21,13 +21,13 @@ #include <unistd.h> #include <fcntl.h> -#include "jni.h" -#include "JNIHelp.h" -#include "android_runtime/AndroidRuntime.h" +#include <jni.h> +#include <JNIHelp.h> +#include <android_runtime/AndroidRuntime.h> -#include "utils/Log.h" -#include "media/AudioSystem.h" -#include "media/ToneGenerator.h" +#include <utils/Log.h> +#include <media/AudioSystem.h> +#include <media/ToneGenerator.h> // ---------------------------------------------------------------------------- diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h index 491a950..62c4796 100644 --- a/include/media/JetPlayer.h +++ b/include/media/JetPlayer.h @@ -22,7 +22,7 @@ #include <libsonivox/jet.h> #include <libsonivox/eas_types.h> -#include "AudioTrack.h" +#include <media/AudioTrack.h> namespace android { diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 3714283..ca93ce5 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> #include <new> -#include <EffectBundle.h> +#include "EffectBundle.h" // effect_handle_t interface implementation for bass boost diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp index 358357e..9599dcc 100755 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -24,8 +24,9 @@ #include <stdlib.h> #include <string.h> #include <new> -#include <EffectReverb.h> -#include <LVREV.h> +#include "EffectReverb.h" +// from Reverb/lib +#include "LVREV.h" // effect_handle_t interface implementation for reverb extern "C" const struct effect_interface_s gReverbInterface; diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 1520c01..6b1abb1 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp @@ -16,16 +16,18 @@ */ #define LOG_TAG "mediaserver" +//#define LOG_NDEBUG 0 #include <binder/IPCThreadState.h> #include <binder/ProcessState.h> #include <binder/IServiceManager.h> #include <utils/Log.h> -#include <AudioFlinger.h> -#include <CameraService.h> -#include <MediaPlayerService.h> -#include <AudioPolicyService.h> +// from LOCAL_C_INCLUDES +#include "AudioFlinger.h" +#include "CameraService.h" +#include "MediaPlayerService.h" +#include "AudioPolicyService.h" using namespace android; |