| commit | f6acf98a46ec62ee97a51a1549933c0783ea4355 | [log] [tgz] |
|---|---|---|
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Dec 20 21:54:26 2013 |
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Dec 20 21:54:26 2013 |
| tree | 4c895dac177db1ecf103b12ae688904f2feb7917 | |
| parent | cf2b3acc480b5b316b03ba867d6504618019051f [diff] |
Fix the android clang bot for compiling with thread annotations. TBR=niklas.enbom@webrtc.org R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/6279005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5330 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_device/android/audio_record_jni.h b/webrtc/modules/audio_device/android/audio_record_jni.h index f96f55a..1c525ff 100644 --- a/webrtc/modules/audio_device/android/audio_record_jni.h +++ b/webrtc/modules/audio_device/android/audio_record_jni.h
@@ -110,13 +110,12 @@ int32_t SetRecordingSampleRate(const uint32_t samplesPerSec); private: - // Lock - void Lock() { + void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); - }; - void UnLock() { + } + void UnLock() UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); - }; + } int32_t InitJavaResources(); int32_t InitSampleRate();
diff --git a/webrtc/modules/audio_device/android/audio_track_jni.h b/webrtc/modules/audio_device/android/audio_track_jni.h index 180bcec..1c17210 100644 --- a/webrtc/modules/audio_device/android/audio_track_jni.h +++ b/webrtc/modules/audio_device/android/audio_track_jni.h
@@ -111,13 +111,12 @@ virtual int PlayoutDelayMs() { return 0; } private: - // Lock - void Lock() { + void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); - }; - void UnLock() { + } + void UnLock() UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); - }; + } int32_t InitJavaResources(); int32_t InitSampleRate();