diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-14 13:54:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-14 13:54:21 -0700 |
| commit | d191213ab0146526541913f3fed2d5aa95f58899 (patch) | |
| tree | a016c5591605a25a4ca1e43f3c439592f8c02789 | |
| parent | 27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e (diff) | |
| parent | b4d307481960b6b348fae4b4e8edefd003c3d36c (diff) | |
| download | frameworks_av-d191213ab0146526541913f3fed2d5aa95f58899.zip frameworks_av-d191213ab0146526541913f3fed2d5aa95f58899.tar.gz frameworks_av-d191213ab0146526541913f3fed2d5aa95f58899.tar.bz2 | |
Merge "Use correct syntax for #include <> """
| -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 |
4 files changed, 11 insertions, 8 deletions
diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h index 9f6ff4c..38a3e44 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; |