aboutsummaryrefslogtreecommitdiff
path: root/android-webrtc.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
2014-03-10Fix neon flags.Ying Wang
Change-Id: I54bcb78292b1a807c4fb1a1912d81ecea8033e63
2014-03-10Use arch specific flags to fix multilib build.Ying Wang
Bug: 13391438 Change-Id: Ie9844df210c7ea24da952811ba854850fc17ded9
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-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-13Use -msse2 for SSE2 optimized code.andrew@webrtc.org
When targeting 32-bit Linux, we need to pass -msse2 to gcc to compile SSE2 intrinsics. However, -msse2 also gives gcc license to automatically generate SSE2 instructions wherever it pleases. This will crash our code on processors without SSE2 support. This change breaks the files with SSE2 intrinsics into separate targets, such that we can limit the scope of -msse2 to where it's needed. We no longer need to employ the WEBRTC_USE_SSE2 define; the build system decides when SSE2 is supported and compiles the appropriate files. TBR=bjornv@webrtc.org TEST=audioproc (performance testing), audioproc_unittest, video_processing_unittests, build on Linux (targeting ia32/x64, with disable_sse2==0/1), Mac, Windows Review URL: http://webrtc-codereview.appspot.com/352008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1425 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-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-08-15Some changes made in android makefileleozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/109003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@367 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-08-09Neon optimization for an NS function.kma@google.com
Review URL: http://webrtc-codereview.appspot.com/89017 git-svn-id: http://webrtc.googlecode.com/svn/trunk@334 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-08-08optimization of resampling by 2 in ARMv7, in spl.kma@google.com
Review URL: http://webrtc-codereview.appspot.com/92015 git-svn-id: http://webrtc.googlecode.com/svn/trunk@327 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-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-14Disable prelink when build androidleozwang@google.com
Review URL: http://webrtc-codereview.appspot.com/72001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@211 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
2011-07-11Added 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/ SVN checkout at working revision 180. Change-Id: I952373750f2c500d37f99aab4557aa84597d11b8
2011-06-07add android makefile, some modification in vpx makefile to build encoder ↵leozwang@google.com
from c source for now Review URL: http://webrtc-codereview.appspot.com/29012 git-svn-id: http://webrtc.googlecode.com/svn/trunk@50 4adac7df-926f-26a2-2b94-8c16560cd09d
2011-05-30git-svn-id: http://webrtc.googlecode.com/svn/trunk@11 ↵niklase@google.com
4adac7df-926f-26a2-2b94-8c16560cd09d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 04:00:00 +0000