Merge changes from topic "instruction_set_replace"

am: e1ce5311ac

Change-Id: If7dcd81893e272465694656e955c1081bdc12457

1 files changed, 46 insertions, 0 deletions

diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp
new file mode 100644
index 0000000000..dab60c4034
--- /dev/null
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/Android.bp
@@ -0,0 +1,46 @@
+// Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+
+cc_library_static {
+    name: "libwebrtc_isac",
+    defaults: ["webrtc_flags"],
+
+    srcs: [
+        "arith_routines.c",
+        "arith_routines_hist.c",
+        "arith_routines_logist.c",
+        "bandwidth_estimator.c",
+        "crc.c",
+        "decode.c",
+        "decode_bwe.c",
+        "encode.c",
+        "encode_lpc_swb.c",
+        "entropy_coding.c",
+        "fft.c",
+        "filter_functions.c",
+        "filterbank_tables.c",
+        "filterbanks.c",
+        "intialize.c",
+        "isac.c",
+        "pitch_lag_tables.c",
+        "lattice.c",
+        "lpc_gain_swb_tables.c",
+        "lpc_analysis.c",
+        "lpc_shape_swb12_tables.c",
+        "lpc_shape_swb16_tables.c",
+        "lpc_tables.c",
+        "pitch_estimator.c",
+        "pitch_filter.c",
+        "pitch_gain_tables.c",
+        "spectrum_ar_model_tables.c",
+        "transform.c",
+    ],
+
+    header_libs: ["libwebrtc_isac_interface"],
+    static_libs: ["libwebrtc_spl"],
+}