f227a451a0
* 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