Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69404841 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use correct syntax for #include <> """

parents 5108b1b3 c81d31c3

core/jni/android_media_AudioRecord.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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>

core/jni/android_media_AudioSystem.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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>

core/jni/android_media_AudioTrack.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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>

core/jni/android_media_JetPlayer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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;

core/jni/android_media_ToneGenerator.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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>



// ----------------------------------------------------------------------------