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 /media/mediaserver | |
| 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 <> """
Diffstat (limited to 'media/mediaserver')
| -rw-r--r-- | media/mediaserver/main_mediaserver.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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; |