- Added support for G7221 codec.

- Added support for WebRTC based audio echo cancellation.
- Minor call notification modifications.

app/src/main/cpp/CMakeLists.txt

@@ -1,23 +1,6 @@
 
-#
-# Copyright (C) The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 cmake_minimum_required(VERSION 3.4.1)
 
-# configure import libs
 set(distribution_DIR ${CMAKE_SOURCE_DIR}/../../../../distribution)
 
 add_library(lib_crypto STATIC IMPORTED)
@@ -40,6 +23,14 @@ add_library(lib_opus STATIC IMPORTED)
 set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
         ${distribution_DIR}/opus/lib/${ANDROID_ABI}/libopus.a)
 
+add_library(lib_g722_1 STATIC IMPORTED)
+set_target_properties(lib_g722_1 PROPERTIES IMPORTED_LOCATION
+		${distribution_DIR}/g7221/lib/${ANDROID_ABI}/libg722_1.a)
+
+add_library(lib_webrtc STATIC IMPORTED)
+set_target_properties(lib_webrtc PROPERTIES IMPORTED_LOCATION
+        ${distribution_DIR}/webrtc/lib/${ANDROID_ABI}/libwebrtc.a)
+
 add_library(lib_bn STATIC IMPORTED)
 set_target_properties(lib_bn PROPERTIES IMPORTED_LOCATION
         ${distribution_DIR}/bn/lib/${ANDROID_ABI}/libbn.a)
@@ -61,15 +52,17 @@ target_include_directories(baresip PRIVATE
                            ${distribution_DIR}/baresip/include)
 
 target_link_libraries(baresip
-                      android
-                      OpenSLES
-                      lib_baresip
-                      lib_rem
-                      lib_re
-                      lib_ssl
-                      lib_crypto
-                      lib_opus
-                      lib_zrtp
-                      lib_bn
-                      z
-                      log)
+		android
+		OpenSLES
+		lib_baresip
+		lib_rem
+		lib_re
+		lib_ssl
+		lib_crypto
+		lib_opus
+		lib_g722_1
+		lib_webrtc
+		lib_zrtp
+		lib_bn
+		z
+		log)