675d4373f87b2468a334f2ed48bfa4e6946d80f1 |
|
05-Nov-2015 |
Chih-Hung Hsieh <chh@google.com> |
WIP: Changes after merge commit 'cb3f9bd' 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
/external/webrtc/webrtc/common_audio/Android.mk
|