generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable audio device test on android

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/428005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1829 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-03-02 17:12:14 +00:00
parent c868b99ff3
commit 3197d48407
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio_device/main/source/audio_device.gypi
View File

@ -109,6 +109,14 @@
'android/audio_device_utility_android.h', 'android/audio_device_utility_android.h',
], ],
'conditions': [ 'conditions': [
['OS=="android"', {
'link_settings': {
'libraries': [
'-llog',
'-lOpenSLES',
],
},
}],
['OS=="linux"', { ['OS=="linux"', {
'defines': [ 'defines': [
'LINUX_ALSA', 'LINUX_ALSA',

4
src/modules/audio_device/main/test/audio_device_test_func.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -25,7 +25,7 @@ int func_test(int);
// main() // main()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if !defined(MAC_IPHONE) && !defined(ANDROID) #if !defined(MAC_IPHONE)
int main(int /*argc*/, char* /*argv*/[]) int main(int /*argc*/, char* /*argv*/[])
{ {
func_test(0); func_test(0);

4
src/modules/audio_device/main/test/func_test_manager.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -45,7 +45,7 @@ struct AudioPacket
}; };
// Helper functions // Helper functions
#if !defined(MAC_IPHONE) && !defined(ANDROID) #if !defined(MAC_IPHONE)
char* GetFilename(char* filename) char* GetFilename(char* filename)
{ {
return filename; return filename;