aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
AgeCommit message (Collapse)Author
2015-11-25WIP: Changes after merge commit 'cb3f9bd'Chih-Hung Hsieh
Changes after "git merge cb3f9bd" * git mv old Android.mk from src/ to webrtc/ * Remove old unused files in src/*. * Modify webrtc/.gitignore to keep *.mk files. * Copy old files from master, lost in auto-merge. src/modules/audio_processing/test/unit_test.cc src/modules/audio_coding/codecs/isac/fix/test/{Android.mk,kenny.c} to webrtc, but most of the old test code do not compile with new webrtc API and are commented out. * Move src/modules/audio_processing/test/android/apmtest/jni/*.mk to webrtc/... but the Android.mk files does not work. Commented out its build target. * Changes to Android.mk files: * Change references of src/ to webrtc/. * Fix include path * Fix source file list, remove old non-existing files, add new source files to resolve link errors. * Add new Android.mk files to build some new static libraries to link into current Android webrtc .so files. * Remove unnecessary LOCAL_SHARED_LIBRARIES in Android.mk files that build static libraries. * Remove old unnecessary clang workarounds like -Wno-tautological-pointer-compare -no-integrated-as * Fix include path of debug.pb.h in some source files. * Add -DWEBRTC_POSIX in android-webrtc.mk * Manually merge Android specific changes in src/typedefs.h to webrtc/typedefs.h * Fix trivial syntax error in scoped_ptr.h, calling static_assert. * Use -std=c++0x in webrtc/system_wrappers/source/Android.mk * #undef getchaar in spreadsort.hpp * Verified and not to carry old Android hacks from src/... to webrtc/... src/system_wrappers/source/android/cpu-features.c src/modules/interface/module.h src/modules/audio_coding/codecs/isac/fix/source/filters_neon.c src/system_wrappers/source/trace_posix.cc src/typedefs.h More pathes from Alex Luebs: * Use new unit test kenny.cc. Delete old kenny.cc. Comment out unessential code in kenny.cc to fix link error for now. * Replace old unit test files with new ones in webrtc/modules/audio_processing/Android.mk. Delete old audio_processing/test/unit_test.cc. * Fix compilation errors in webrtc/modules/audio_processing/test/audio_processing_unittest.cc Change-Id: I7bbf776eeb9dcfa21a82dd1f2dec378235cbbc3e
2015-10-12Merge from upstream SVN r2699, git SHA 9b1cf54.Chih-Hung Hsieh
* Last major but partial merge from upstream was from r2699 on 9/17/2012. Manual changes after "git merge 9b1cf54" * Remove LOCAL_CLANG:=false * Fix or workaround clang compilation error: * Remove unnecessary LOCAL_CLANG_* flags or add comment. * Fix type cast error and asm code error in src/modules/audio_coding/codecs/isac/fix/source/filters_neon.c * Keep AOSP's Android.mk files, but update include path, local source file lists, and new -D predefined macros. * Remove new Android.mk files from r2699. We do not need new features from r2699. * Remove all definition and use of WEBRTC_TARGET_PC and WEBRTC_USE_SSE2. They are not needed with new upgraded Android.mk files. * Keep old AOSP patches to compile on Android in src/system_wrappers/source/android/cpu-features.c src/modules/audio_coding/codecs/isac/fix/test/kenny.c src/common_audio/signal_processing/spl_sqrt_floor.c src/typedefs.h * In /src/common_audio/signal_processing, the following C files have new definitions from r2699, and some .s files for neon. The new .s files have compilation error on AOSP, so we skip them. The .s files are changed to .S in newer upstream versions that we could merge in later and hopefully resolve all the problems. The new .c files should also work, no worse than current AOSP .c files. min_mnax_operations_neon.c cross_correlation.c downsample_fast.c filter_ar_fast_q12.c complex_bit_reverse.c * Use nsx_core_neon.c instead of nsx_core_neon.S for arm64 target because of arm64 compilation errors on AOSP. * Remove unused parameter in src/modules/interface/module.h. * Remove ./test, src/.../Testsort.cpp, and other files that were in AOSP but not used and not in r2699. * Some r2699 features are not ported to AOSP: MY_WEBRTC_ROOT_PATH, LOCAL_PRELINK_MODULE, libstlport, TARGET_SIMULATOR, webrtc_audioproc, webrtc_audioproc_unittest, external/gtest/include, libgtest, libstlport * Remove WEBRTC_USE_SSE2, no need after upgrade. * Copy upstream *.gypi files, but they are not used in AOSP build. After this merge of r2699, we should have git merge history to simplify future merges. Change-Id: I703e59bdb27d60cd5aab9f0744dd8ce25d0ea339
2015-09-08Fix name for NDK protobuf libraries.Dan Albert
NDK protobuf libs are being renamed with -ndk for clarity. Change-Id: Ida2d6e99adea2cf25453d3b5d2bbd124f45d65c3
2015-01-08Update protobuf library from 2.3 to 2.6.Jeff Davidson
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: I352b6639bdcd2ec6002d052bcd795cf008c12256
2014-11-11Move the platform libraries to libc++.Dan Albert
Bug: 15193147 Change-Id: I259465ecb5bed5005c717a7e660dc6b28be52c55
2014-05-07Remove ndk_build from platform makefile.leozwang
Webrtc used to support both platform build and ndk build in a single makefile. However, ndk build should be done by gyp, no need to support ndk build in android makefile, remove NDK_ROOT. Change-Id: I73c4ab84cec9f4f2d75ec21a50e420f9b076fce4
2014-03-13Remove "../"s in LOCAL_SRC_FILESYing Wang
"../" leads to object files spilling out of the module's intermediate directory and causes build race condition. Change-Id: I0f503b2ecca391b5255848e1ed6b56a898753ae8
2014-03-10Only build neon code for arm but not arm64.Ying Wang
This fixed aosp_arm64 build. Change-Id: Ic4840c57a7d2b68c199c725c35d61f85adfee9e7
2014-02-28Fix misuse of $(my-dir).Ying Wang
Change-Id: I68512b022539a861ef2e338410229fd21a5da67b
2013-02-05Add libwebrtc_audio_coding_gnustl_static static libraryPrzemyslaw Szczepaniak
Attempt number 2. Now with working tests. This change allows to build fully unbundled GoogleTTS apk that can be deployed on any >= ICS_MR1 device. All static libraries under src/* can be build using ndk stl libraries, using WEBRTC_STL varible. libwebrtc_audio_coding_gnustl_static is static version of libwebrtc_audio_coding, build using gnustl from ndk. Change-Id: I41a5163eb434432eab3131f5df23ffd311e6159b
2013-02-04Revert "Add libwebrtc_audio_coding_gnustl_static static library". It tests ↵Przemyslaw Szczepaniak
are broken This reverts commit 62f88b75e4f2cf47433a0a8948d679c0334f2204 Change-Id: I3a2c531c28d47867eb189d45c04632b54e9acca6
2013-02-01Add libwebrtc_audio_coding_gnustl_static static libraryPrzemyslaw Szczepaniak
This change allows to build fully unbundled GoogleTTS apk that can be deployed on any >= ICS_MR1 device. All static libraries under src/* can be build using ndk stl libraries, using WEBRTC_STL varible. libwebrtc_audio_coding_gnustl_static is static version of libwebrtc_audio_coding, build using gnustl from ndk. Bug: 6397748 Change-Id: Ibf0acb11d3e605a1d4c668bbf98b0a0bb55399bc
2012-09-18Added fixed point iSAC codec implementation.Alexander Gutkin
- Added fixed-point iSAC audio codec implementation (from stable r2699). - Updated system wrappers (from stable r2699). - Some cosmetic makefile changes. Change-Id: If75d503698c11a4e4ceb851529127aadfe52f255
2012-08-21Added iSAC coder.Alexander Gutkin
- Imported the floating point implementation of iSAC coder from stable public webRTC release: http://code.google.com/p/webrtc/source/browse/#svn%2Fstable - Added a reminder (in a TODO file) to switch from floating point to fixed point implementation. Please note that this is the minimal amount of functionality we (the speech text-to-speech team) require for delivering our unit selection algorithms for the Glass project. I'd be happy to address any comments you have. Change-Id: I20481680786ec5372258efcea69ea5c9750a321a
2012-08-13Remove iSAC and resampler from platform buildleozwang@webrtc.org
BUG= TEST=trybots Review URL: https://webrtc-codereview.appspot.com/720007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2605 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-08-09Fix Android after iSAC -> isac move.andrew@webrtc.org
TBR=leozwang@webrtc.org BUG=none TEST=android trybot Review URL: https://webrtc-codereview.appspot.com/708011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2585 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-07-10Corrected one error for Android build.kma@webrtc.org
Also added iSAC in the default build in Android, to test any build errors in iSAC in platform build in buildbot. Review URL: https://webrtc-codereview.appspot.com/684004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2505 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-03-13Remove video from Android.mkleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/453002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1883 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-02-15Converted old jpeg_test tool to gtest unit test.kjellander@webrtc.org
Restructured paths to new directory layout. Stefan: common_video/* Magnus: video_engine/* Niklas: Android.mk BUG= TEST=jpeg_unittests on Debug+Release on Linux, Mac, Windows. Valgrind on Linux passes without warnings. Review URL: https://webrtc-codereview.appspot.com/388007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1691 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-02-02update to webrtc revision 1349Eric Laurent
Updated audio processing modules from revision 180 to 1349. Main changes are: - code clean up and reformating - source path reorganization - improved performance Also imported test code that was not included in initial drop from webrtc. Change-Id: Ie4eb0e29990052e5f2d7f0b271b42eead40dbb6a
2012-01-24Enable building library and test appleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/369007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1537 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-20Add an argument in ANDROID_NOT_SUPPORT macroleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/363003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1499 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-20Changed to use std::sortleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/356003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1488 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-19Enable all modules without building errorsleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/360004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1485 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-19Enable APM on androidleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/359001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1483 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-19Enable three modulesleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/343019 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1481 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-17Revert r1426 because of buildbot errorsleozwang@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/352011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1446 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-14Enable apm in android.mkleozwang@webrtc.org
Review URL: http://webrtc-codereview.appspot.com/345009 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1426 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-10Comment out one more component which is forgot in last CLleozwang@webrtc.org
Review URL: http://webrtc-codereview.appspot.com/342005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1376 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-09Disable some modules to have a constant green buildleozwang@webrtc.org
Review URL: http://webrtc-codereview.appspot.com/342003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1360 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-01-04Changed build settings for ARMv5 in Android.kma@webrtc.org
I found some issues in building ARMv5 with ICM. This CL includes fixes, and a design change which now will exclude any NEON libraries unless the build is for dynamic detection or for Neon specifically. Review URL: http://webrtc-codereview.appspot.com/330021 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1335 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-12-14temporarily disable some modules from Android.mk leozwang@webrtc.org
Review URL: http://webrtc-codereview.appspot.com/324006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1198 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-12-14Optimized WebRtcIsacfix_NormLatticeFilterMa() function for iSAC fix for ARM Neonkma@webrtc.org
architecture with intrinsics and assembly code. The total iSAC codec speech improved about 3~5%. Notes (1) The Neon version after this optimization is not bit-exact with the generic C version. The out quality, however, is not worse as verified by test vectors ouput, and undertandably in theory (32bit x 32bit in Neon is more accurate than the approximation C code in the generic version). (2) In Android, a isac neon library will be built. Along with some new function structures, it is partly for preparation of introducing a run time detection of Neon architecture soon. Review URL: http://webrtc-codereview.appspot.com/268016 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1192 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-12-09Fixing paths to Video engine Android.mk files.kjellander@webrtc.org
BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/320006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1149 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-12-03For Android ARMv7 platforms, added a feature of dynamically detecting the ↵kma@webrtc.org
existence of Neon, and when it's present, switch to some functions optimized for Neon at run time. Review URL: http://webrtc-codereview.appspot.com/268002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1096 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-17Restructuring and adding dummy unit test target.kjellander@webrtc.org
Empty test added to get code coverage recorded. Review URL: http://webrtc-codereview.appspot.com/269018 git-svn-id: http://webrtc.googlecode.com/svn/trunk@967 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-17Restructuring and adding dummy unit test target.kjellander@webrtc.org
Empty test added to get code coverage recorded. Review URL: http://webrtc-codereview.appspot.com/267019 git-svn-id: http://webrtc.googlecode.com/svn/trunk@966 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-17Restructuring and adding dummy unit test target.kjellander@webrtc.org
Empty test added to get code coverage recorded. Review URL: http://webrtc-codereview.appspot.com/280004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@965 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-17Restructuring and adding dummy unit test target.kjellander@webrtc.org
Empty test added to get code coverage recorded. Review URL: http://webrtc-codereview.appspot.com/282001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@964 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-17Restructuring and adding unit test targets on project level instead of in ↵kjellander@webrtc.org
common_audio. Review URL: http://webrtc-codereview.appspot.com/280001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@959 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-11-07Changes for building audio coding in anroid. Only makefiles are touched.kma@webrtc.org
Review URL: http://webrtc-codereview.appspot.com/266004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@899 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-10-19Reorganize the audio_processing source.andrew@webrtc.org
- Remove main and source directories. - Change .gyp, .gypi and Android.mk files correspondingly. No other source changes. Review URL: http://webrtc-codereview.appspot.com/241001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@767 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-08-05Enable protobuf for apm moduleleozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/93019 git-svn-id: http://webrtc.googlecode.com/svn/trunk@319 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-08-05Clean up Android.mkleozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/92014 git-svn-id: http://webrtc.googlecode.com/svn/trunk@315 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-07-27Clean up ANDROID macro definitions [common_audio]leozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/91004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@262 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-07-25Clean up ANDROID macro definitions [Root folder]leozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/91003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@249 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-07-13Change android makefile to reflect recent file structure changeleozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/67001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@200 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-07-12Added webrtc audio processing libraryEric Laurent
Only the modules necessary for audio processing have been imported: src/common_audio/ src/modules/audio_processing/ src/modules/interface/ src/system_wrappers/ src/typedefs.h src/common_types.h Android.mk android-webrtc.mk Android.mk and android-webrtc.mk have been modified to build only the audio processing modules. Files for Windows compatibility have been removed from system_wrappers. fft_ARM9E directory has been removed from src/common_audio/signal_processing_library/main/source/ Fixed x86 build. SVN checkout at working revision 180. Change-Id: If650f61d96557be8247b17eb4f4d32b7a6ba025d
2011-07-11Revert "Added webrtc audio processing library"Eric Laurent
This reverts commit 4e51691e58d8d32590b03c1951cb13de4d1c4758
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 08:33:41 +0000