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

1 files changed, 42 insertions, 30 deletions

diff --git a/Android.mk b/Android.mk
index ee918eb9eb..aead39efb4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,16 +16,23 @@ LOCAL_MODULE := libwebrtc_audio_preprocessing
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
-    libwebrtc_spl \
-    libwebrtc_resampler \
+    libwebrtc_aec \
+    libwebrtc_aecm \
+    libwebrtc_agc \
     libwebrtc_apm \
     libwebrtc_apm_utility \
-    libwebrtc_vad \
+    libwebrtc_apvad \
+    libwebrtc_base \
+    libwebrtc_beamformer \
+    libwebrtc_common \
+    libwebrtc_intell \
+    libwebrtc_isac \
+    libwebrtc_resampler \
     libwebrtc_ns \
-    libwebrtc_agc \
-    libwebrtc_aec \
-    libwebrtc_aecm \
-    libwebrtc_system_wrappers
+    libwebrtc_spl \
+    libwebrtc_system_wrappers \
+    libwebrtc_transient \
+    libwebrtc_vad \
 
 # Add Neon libraries.
 ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
@@ -39,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
     libdl \
     libprotobuf-cpp-lite \
 
-
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -51,10 +57,15 @@ LOCAL_MODULE := libwebrtc_audio_coding
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libwebrtc_base \
+    libwebrtc_common \
+    libwebrtc_intell \
     libwebrtc_isac \
     libwebrtc_isacfix \
+    libwebrtc_resampler \
     libwebrtc_spl \
-    libwebrtc_system_wrappers
+    libwebrtc_system_wrappers \
+
 ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
 LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
     libwebrtc_isacfix_neon
@@ -65,7 +76,6 @@ LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
 
-
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -88,10 +98,6 @@ endif
 
 LOCAL_STATIC_LIBRARIES := \
     libprotobuf-cpp-lite
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libdl
-
 
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_SDK_VERSION := 14
@@ -100,22 +106,28 @@ include $(BUILD_STATIC_LIBRARY)
 
 webrtc_path := $(LOCAL_PATH)
 # voice
-include $(webrtc_path)/src/common_audio/resampler/Android.mk
-include $(webrtc_path)/src/common_audio/signal_processing/Android.mk
-include $(webrtc_path)/src/common_audio/vad/Android.mk
-include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
-include $(webrtc_path)/src/modules/audio_coding/codecs/isac/main/source/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/aec/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/aecm/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/agc/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/ns/Android.mk
-include $(webrtc_path)/src/modules/audio_processing/utility/Android.mk
-include $(webrtc_path)/src/system_wrappers/source/Android.mk
+include $(webrtc_path)/webrtc/base/Android.mk
+include $(webrtc_path)/webrtc/common_audio/Android.mk
+include $(webrtc_path)/webrtc/common_audio/resampler/Android.mk
+include $(webrtc_path)/webrtc/common_audio/signal_processing/Android.mk
+include $(webrtc_path)/webrtc/common_audio/vad/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/aec/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/aecm/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/agc/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/beamformer/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/intelligibility/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/ns/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/transient/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/utility/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_processing/vad/Android.mk
+include $(webrtc_path)/webrtc/system_wrappers/source/Android.mk
 
 # libwebrtc_audio_coding_gnustl_static dependencies
 WEBRTC_STL := gnustl_static
-include $(webrtc_path)/src/system_wrappers/source/Android.mk
-include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
-include $(webrtc_path)/src/modules/audio_coding/codecs/isac/main/source/Android.mk
-include $(webrtc_path)/src/common_audio/signal_processing/Android.mk
+include $(webrtc_path)/webrtc/system_wrappers/source/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
+include $(webrtc_path)/webrtc/modules/audio_coding/codecs/isac/main/source/Android.mk
+include $(webrtc_path)/webrtc/common_audio/signal_processing/Android.mk